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

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

[Jesper Juhl]

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@dif.dk>

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++;
 

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

[Andrew Morton]

Jesper Juhl <juhl-lkml@dif.dk> wrote:
>
> 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.

yup.  I have this queued up:

--- 25/include/linux/swap.h~fix-config_swap-n-build	Thu Dec 23 14:34:08 2004
+++ 25-akpm/include/linux/swap.h	Thu Dec 23 14:34:08 2004
@@ -269,6 +269,7 @@ static inline void put_swap_token(struct
 #define move_from_swap_cache(p, i, m)		1
 #define __delete_from_swap_cache(p)		/*NOTHING*/
 #define delete_from_swap_cache(p)		/*NOTHING*/
+#define swap_token_default_timeout		0
 
 static inline int remove_exclusive_swap_page(struct page *p)
 {