commit 95a71a45c250177854f7c530810c88a8a19a443b
author Yinghai Lu <yhlu.kernel@gmail.com> Wed Jun 18 17:27:08 2008 -0700
committer Ingo Molnar <mingo@elte.hu> Tue Jul 08 10:39:01 2008 +0200
tree 9a063a825cdc5d088973ad06b7cecfb789c3a0dd
parent 66a6f8d539416c9664f3a04ecb12f55a0097ab8c

x86: cleanup machine_specific_memory_setup, v2

1. let 64bit support 88 and e801 too
2. introduce default_machine_specific_memory_setup, and reuse it
   for voyager

v2: fix 64 bit compiling

Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

include/asm-x86/e820.h

diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h
index 83144cb..668a0d7 100644
--- a/include/asm-x86/e820.h
+++ b/include/asm-x86/e820.h
@@ -102,6 +102,7 @@
 extern void finish_e820_parsing(void);
 extern void e820_reserve_resources(void);
 extern void setup_memory_map(void);
+extern char *default_machine_specific_memory_setup(void);
 extern char *machine_specific_memory_setup(void);
 extern char *memory_setup(void);
 
@@ -116,9 +117,7 @@
 #ifdef __KERNEL__
 #include <linux/ioport.h>
 
-#ifdef CONFIG_X86_32
 #define HIGH_MEMORY	(1024*1024)
-#endif
 #endif /* __KERNEL__ */
 
 #endif  /* __ASM_E820_H */