This fixes up the current x86_64 support to the point it will actually compile and boot. From here, I'll work on merging some of this upstream to keep specifics for this arch small. matt Signed-off-by: Matt Tolentino Signed-off-by: Dave Hansen --- memhotplug-dave/include/asm-x86_64/page.h | 6 +++++- 1 files changed, 5 insertions(+), 1 deletion(-) diff -puN include/asm-x86_64/page.h~H1-fixup_x86_64 include/asm-x86_64/page.h --- memhotplug/include/asm-x86_64/page.h~H1-fixup_x86_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 @@ -120,7 +120,7 @@ extern __inline__ int get_order(unsigned #else #include #endif -+ + /* * __pa_symbol should be used for C visible symbols. * This seems to be the official gcc blessed way to do @@ -132,15 +132,19 @@ extern __inline__ int get_order(unsigned __boot_pa(v); }) #ifndef CONFIG_DISCONTIGMEM +#ifndef CONFIG_NONLINEAR #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) #define pfn_to_kaddr(pfn) __va((pfn) << PAGE_SHIFT) +#endif /* __ASSEMBLY__ */ + #define VM_DATA_DEFAULT_FLAGS \ (((current->personality & READ_IMPLIES_EXEC) ? VM_EXEC : 0 ) | \ VM_READ | VM_WRITE | VM_MAYREAD | VM_MAYWRITE | VM_MAYEXEC) diff -L mm/memory_hotplug.c -puN /dev/null /dev/null _