[PATCH] mincore: CONFIG_SWAP=n fix

Fix mincore-anon patch to compile with CONFIG_SWAP=n

Signed-off-by: Nick Piggin <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/mm/mincore.c b/mm/mincore.c
index 95c5f49f0a1ada33c90e292010149ab8f3e404b9..9780097e3812cf2c5c57a2fa3e21517215fedb8d 100644 (file)
--- 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
                        }
                }
        }