X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=mm%2Fswap_state.c;h=e0e1583f32c26cc2579554a4abcc797a9a671553;hb=0e838b72d54ed189033939258a961f2a0cd59647;hp=7b09ac503fec9dde77422705a08b2a1f087d0d70;hpb=ab396e91bfe953db26fa1083d9c3e7a4fbe0334a;p=firefly-linux-kernel-4.4.55.git

diff --git a/mm/swap_state.c b/mm/swap_state.c
index 7b09ac503fec..e0e1583f32c2 100644
--- a/mm/swap_state.c
+++ b/mm/swap_state.c
@@ -15,6 +15,7 @@
 #include <linux/buffer_head.h>
 #include <linux/backing-dev.h>
 #include <linux/pagevec.h>
+#include <linux/migrate.h>
 
 #include <asm/pgtable.h>
 
@@ -27,6 +28,7 @@ static struct address_space_operations swap_aops = {
 	.writepage	= swap_writepage,
 	.sync_page	= block_sync_page,
 	.set_page_dirty	= __set_page_dirty_nobuffers,
+	.migratepage	= migrate_page,
 };
 
 static struct backing_dev_info swap_backing_dev_info = {
@@ -146,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();