[PATCH] fix mm/rmap.c build failure if CONFIG_SWAP is not defined(2.6.10-rc3-bk16)

From: Jesper Juhl
Date: Thu Dec 23 2004 - 18:32:33 EST



I just tried a allnoconfig build of 2.6.10-rc3-bk16, and it fails on
mm/rmap.c since swap_token_default_timeout is not defined by
include/linux/swap.h if CONFIG_SWAP is not defined. The patch below just
makes the small bit that uses swap_token_default_timeout be conditionally
build depending on CONFIG_SWAP being defined or not, but I have no idea if
this is the proper way to fix this (it does allow it to build though).


Signed-off-by: Jesper Juhl <juhl-lkml@xxxxxx>

diff -up linux-2.6.10-rc3-bk16-orig/mm/rmap.c linux-2.6.10-rc3-bk16/mm/rmap.c
--- linux-2.6.10-rc3-bk16-orig/mm/rmap.c 2004-12-23 23:26:50.000000000 +0100
+++ linux-2.6.10-rc3-bk16/mm/rmap.c 2004-12-24 00:36:01.000000000 +0100
@@ -395,9 +395,10 @@ int page_referenced(struct page *page, i
{
int referenced = 0;

+#ifdef CONFIG_SWAP
if (!swap_token_default_timeout)
ignore_token = 1;
-
+#endif
if (page_test_and_clear_young(page))
referenced++;



-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/