diff --git a/[refs] b/[refs]
index 3f0f9adbc2a6..93bb8a0222ac 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 724339d76d9407cd1a8ad32a9c1fdf64840cc51b
+refs/heads/master: 30fcffed8149df18592b3e006b829232b7b3844f
diff --git a/trunk/mm/mincore.c b/trunk/mm/mincore.c
index 95c5f49f0a1a..9780097e3812 100644
--- a/trunk/mm/mincore.c
+++ b/trunk/mm/mincore.c
@@ -116,8 +116,13 @@ static long do_mincore(unsigned long addr, unsigned char *vec, unsigned long pag
 				/* migration entries are always uptodate */
 				present = 1;
 			} else {
+#ifdef CONFIG_SWAP
 				pgoff = entry.val;
 				present = mincore_page(&swapper_space, pgoff);
+#else
+				WARN_ON(1);
+				present = 1;
+#endif
 			}
 		}
 	}