From d6bcce059a85fabb1043b307c800c0314ebf6ad6 Mon Sep 17 00:00:00 2001
From: Nick Piggin <npiggin@suse.de>
Date: Wed, 14 Feb 2007 12:35:02 +0100
Subject: [PATCH] --- yaml --- r: 48503 b: refs/heads/master c:
 30fcffed8149df18592b3e006b829232b7b3844f h: refs/heads/master i:   48501:
 7459b8a92b6c205efc73841499354eeca0de24c0   48499:
 e7455f1d88e9bfb3c91d42490d832d641a7462f0   48495:
 f02dc424ee1d85ffa9be04b8506389a0cd325adc v: v3

---
 [refs]             | 2 +-
 trunk/mm/mincore.c | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

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
 			}
 		}
 	}