diff options
Diffstat (limited to 'include/asm-x86/e820.h')
-rw-r--r-- | include/asm-x86/e820.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h index 83144cb6c68d..668a0d743d25 100644 --- a/include/asm-x86/e820.h +++ b/include/asm-x86/e820.h | |||
@@ -102,6 +102,7 @@ extern u64 e820_hole_size(u64 start, u64 end); | |||
102 | extern void finish_e820_parsing(void); | 102 | extern void finish_e820_parsing(void); |
103 | extern void e820_reserve_resources(void); | 103 | extern void e820_reserve_resources(void); |
104 | extern void setup_memory_map(void); | 104 | extern void setup_memory_map(void); |
105 | extern char *default_machine_specific_memory_setup(void); | ||
105 | extern char *machine_specific_memory_setup(void); | 106 | extern char *machine_specific_memory_setup(void); |
106 | extern char *memory_setup(void); | 107 | extern char *memory_setup(void); |
107 | 108 | ||
@@ -116,9 +117,7 @@ extern char *memory_setup(void); | |||
116 | #ifdef __KERNEL__ | 117 | #ifdef __KERNEL__ |
117 | #include <linux/ioport.h> | 118 | #include <linux/ioport.h> |
118 | 119 | ||
119 | #ifdef CONFIG_X86_32 | ||
120 | #define HIGH_MEMORY (1024*1024) | 120 | #define HIGH_MEMORY (1024*1024) |
121 | #endif | ||
122 | #endif /* __KERNEL__ */ | 121 | #endif /* __KERNEL__ */ |
123 | 122 | ||
124 | #endif /* __ASM_E820_H */ | 123 | #endif /* __ASM_E820_H */ |