Merge ../linux-2.6

[linux-2.6] / mm / swap_state.c

diff --git a/mm/swap_state.c b/mm/swap_state.c
index d7af296833fcbc1b3dccfbde33db51fb2fd3934a..e0e1583f32c26cc2579554a4abcc797a9a671553 100644 (file)
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -148,8 +148,7 @@ int add_to_swap(struct page * page, gfp_t gfp_mask)
        swp_entry_t entry;
        int err;
 
-       if (!PageLocked(page))
-               BUG();
+       BUG_ON(!PageLocked(page));
 
        for (;;) {
                entry = get_swap_page();