linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / mm / swap_state.c

diff --git a/mm/swap_state.c b/mm/swap_state.c
index e0e1583..db8a3d3 100644 (file)
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -15,7 +15,6 @@
 #include <linux/buffer_head.h>
 #include <linux/backing-dev.h>
 #include <linux/pagevec.h>
-#include <linux/migrate.h>
 
 #include <asm/pgtable.h>
 
@@ -148,7 +147,8 @@ int add_to_swap(struct page * page, gfp_t gfp_mask)
        swp_entry_t entry;
        int err;
 
-       BUG_ON(!PageLocked(page));
+       if (!PageLocked(page))
+               BUG();
 
        for (;;) {
                entry = get_swap_page();