Here's a small patch that gets rid of two #ifndefs for DISCONTIG and NONLINEAR and replaces with ARCH_HAS_MEMMAP like i386 as suggested by Dave. matt Signed-off-by: Matt Tolentino Signed-off-by: Dave Hansen --- memhotplug-dave/include/asm-x86_64/page.h | 4 +--- 1 files changed, 1 insertion(+), 3 deletions(-) diff -puN include/asm-x86_64/page.h~H2-use_ARCH_HAS_MEMMAP_for_x64-64 include/asm-x86_64/page.h --- memhotplug/include/asm-x86_64/page.h~H2-use_ARCH_HAS_MEMMAP_for_x64-64 2004-10-12 10:10:58.000000000 -0700 +++ memhotplug-dave/include/asm-x86_64/page.h 2004-10-12 10:10:58.000000000 -0700 @@ -131,13 +131,11 @@ extern __inline__ int get_order(unsigned asm("" : "=r" (v) : "0" (x)); \ __boot_pa(v); }) -#ifndef CONFIG_DISCONTIGMEM -#ifndef CONFIG_NONLINEAR +#ifdef CONFIG_ARCH_HAS_MEMMAP #define pfn_to_page(pfn) (mem_map + (pfn)) #define page_to_pfn(page) ((unsigned long)((page) - mem_map)) #define pfn_valid(pfn) ((pfn) < max_mapnr) #endif -#endif #define virt_to_page(kaddr) pfn_to_page(__pa(kaddr) >> PAGE_SHIFT) #define virt_addr_valid(kaddr) pfn_valid(__pa(kaddr) >> PAGE_SHIFT) _