---
 include/linux/mm.h |   14 +++-----------
 mm/highmem.c       |    3 ---
 2 files changed, 3 insertions(+), 14 deletions(-)

Index: linux-2.6/include/linux/mm.h
===================================================================
--- linux-2.6.orig/include/linux/mm.h	2007-10-03 15:32:07.000000000 -0700
+++ linux-2.6/include/linux/mm.h	2007-10-03 15:33:29.000000000 -0700
@@ -587,31 +587,23 @@ static __always_inline void *lowmem_page
 	return __va(page_to_pfn(page) << PAGE_SHIFT);
 }
 
-#if defined(CONFIG_HIGHMEM) && !defined(WANT_PAGE_VIRTUAL)
+#ifndef WANT_PAGE_VIRTUAL
 #define HASHED_PAGE_VIRTUAL
 #endif
 
-#if defined(WANT_PAGE_VIRTUAL)
+#ifdef WANT_PAGE_VIRTUAL
 #define page_address(page) ((page)->virtual)
 #define set_page_address(page, address)			\
 	do {						\
 		(page)->virtual = (address);		\
 	} while(0)
 #define page_address_init()  do { } while(0)
-#endif
-
-#if defined(HASHED_PAGE_VIRTUAL)
+#else
 void *page_address(struct page *page);
 void set_page_address(struct page *page, void *virtual);
 void page_address_init(void);
 #endif
 
-#if !defined(HASHED_PAGE_VIRTUAL) && !defined(WANT_PAGE_VIRTUAL)
-#define page_address(page) lowmem_page_address(page)
-#define set_page_address(page, address)  do { } while(0)
-#define page_address_init()  do { } while(0)
-#endif
-
 /*
  * On an anonymous page mapped into a user virtual memory area,
  * page->mapping points to its anon_vma, not to a struct address_space;
Index: linux-2.6/mm/highmem.c
===================================================================
--- linux-2.6.orig/mm/highmem.c	2007-10-03 15:33:37.000000000 -0700
+++ linux-2.6/mm/highmem.c	2007-10-03 15:33:53.000000000 -0700
@@ -227,8 +227,6 @@ void fastcall kunmap_high(struct page *p
 EXPORT_SYMBOL(kunmap_high);
 #endif
 
-#if defined(HASHED_PAGE_VIRTUAL)
-
 #define PA_HASH_ORDER	7
 
 /*
@@ -346,4 +344,3 @@ void __init page_address_init(void)
 	spin_lock_init(&pool_lock);
 }
 
-#endif	/* defined(CONFIG_HIGHMEM) && !defined(WANT_PAGE_VIRTUAL) */