summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNick Piggin <npiggin@suse.de>2007-02-14 12:35:02 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-02-15 09:57:03 -0800
commit30fcffed8149df18592b3e006b829232b7b3844f (patch)
tree3cfd5abc06e26ff9782897ddff3017138d0fcdf2
parent724339d76d9407cd1a8ad32a9c1fdf64840cc51b (diff)
downloadlinux-30fcffed8149df18592b3e006b829232b7b3844f.tar.gz
linux-30fcffed8149df18592b3e006b829232b7b3844f.tar.bz2
linux-30fcffed8149df18592b3e006b829232b7b3844f.zip
[PATCH] mincore: CONFIG_SWAP=n fix
Fix mincore-anon patch to compile with CONFIG_SWAP=n Signed-off-by: Nick Piggin <npiggin@suse.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--mm/mincore.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/mm/mincore.c b/mm/mincore.c
index 95c5f49f0a1a..9780097e3812 100644
--- a/mm/mincore.c
+++ b/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
}
}
}