diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-17 04:58:28 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 10:38:25 +0200 |
| commit | 064d25f12014ae1d97c2882f9ab874995321f2b2 (patch) | |
| tree | a6f39b226bbae5a2abc15d911cdf12d01b9c8c19 /include/asm-x86/e820.h | |
| parent | x86: kill bad_ppro (diff) | |
| download | linux-064d25f12014ae1d97c2882f9ab874995321f2b2.tar.xz linux-064d25f12014ae1d97c2882f9ab874995321f2b2.zip | |
x86: merge setup_memory_map with e820
... and kill e820_32/64.c and e820_32/64.h
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86/e820.h')
| -rw-r--r-- | include/asm-x86/e820.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h index e860fe758e79..83144cb6c68d 100644 --- a/include/asm-x86/e820.h +++ b/include/asm-x86/e820.h @@ -101,6 +101,9 @@ extern void e820_register_active_regions(int nid, unsigned long start_pfn, extern u64 e820_hole_size(u64 start, u64 end); extern void finish_e820_parsing(void); extern void e820_reserve_resources(void); +extern void setup_memory_map(void); +extern char *machine_specific_memory_setup(void); +extern char *memory_setup(void); #endif /* __ASSEMBLY__ */ @@ -111,10 +114,10 @@ extern void e820_reserve_resources(void); #define BIOS_END 0x00100000 #ifdef __KERNEL__ +#include <linux/ioport.h> + #ifdef CONFIG_X86_32 -# include "e820_32.h" -#else -# include "e820_64.h" +#define HIGH_MEMORY (1024*1024) #endif #endif /* __KERNEL__ */ |