diff --git a/[refs] b/[refs]
index 0ebc5c6deec0..9f3ffb7ad6f5 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: eed6565f70ce3fc958e5a3483c48fc4a8e111bdc
+refs/heads/master: 852cf918dcf2ae46468b425e679fbcbf0ea8fdbb
diff --git a/trunk/include/linux/swap.h b/trunk/include/linux/swap.h
index 389d1c382e20..e92054d6530b 100644
--- a/trunk/include/linux/swap.h
+++ b/trunk/include/linux/swap.h
@@ -180,6 +180,11 @@ extern int isolate_lru_page(struct page *p);
 extern int putback_lru_pages(struct list_head *l);
 extern int migrate_pages(struct list_head *l, struct list_head *t,
 		struct list_head *moved, struct list_head *failed);
+#else
+static inline int isolate_lru_page(struct page *p) { return -ENOSYS; }
+static inline int putback_lru_pages(struct list_head *l) { return 0; }
+static inline int migrate_pages(struct list_head *l, struct list_head *t,
+	struct list_head *moved, struct list_head *failed) { return -ENOSYS; }
 #endif
 
 #ifdef CONFIG_MMU