move early_res related from e820_64.c to e820.c make edba detection to be done in head32.c remove smp_alloc_memory, because we have fixed trampoline address now. Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> arch/x86/kernel/e820.c | 214 ++++++++++++++++++++++++++++++++++++ arch/x86/kernel/e820_64.c | 196 -------------------------------- arch/x86/kernel/head32.c | 76 ++++++++++++ arch/x86/kernel/setup_32.c | 109 +++--------------- arch/x86/kernel/smpboot.c | 17 -- arch/x86/kernel/trampoline.c | 2 arch/x86/mach-voyager/voyager_smp.c | 9 - include/asm-x86/e820.h | 6 + include/asm-x86/e820_64.h | 9 - include/asm-x86/smp.h | 1 arch/x86/kernel/e820.c | 214 ++++++++++++++++++++++++++++++++++++ arch/x86/kernel/e820_64.c | 196 -------------------------------- arch/x86/kernel/head32.c | 76 ++++++++++++ arch/x86/kernel/setup_32.c | 109 +++--------------- arch/x86/kernel/smpboot.c | 17 -- arch/x86/kernel/trampoline.c | 2 arch/x86/mach-voyager/voyager_smp.c | 9 - include/asm-x86/e820.h | 6 + include/asm-x86/e820_64.h | 9 - include/asm-x86/smp.h | 1 arch/x86/kernel/e820.c | 214 ++++++++++++++++++++++++++++++++++++ arch/x86/kernel/e820_64.c | 196 -------------------------------- arch/x86/kernel/head32.c | 76 ++++++++++++ arch/x86/kernel/setup_32.c | 109 +++--------------- arch/x86/kernel/smpboot.c | 17 -- arch/x86/kernel/trampoline.c | 2 arch/x86/mach-voyager/voyager_smp.c | 9 - include/asm-x86/e820.h | 6 + include/asm-x86/e820_64.h | 9 - include/asm-x86/smp.h | 1 10 files changed, 320 insertions(+), 319 deletions(-) Signed-off-by: Ingo Molnar <mingo@elte.hu>
36 lines
1.2 KiB
C
36 lines
1.2 KiB
C
/*
|
|
* structures and definitions for the int 15, ax=e820 memory map
|
|
* scheme.
|
|
*
|
|
* In a nutshell, setup.S populates a scratch table in the
|
|
* empty_zero_block that contains a list of usable address/size
|
|
* duples. setup.c, this information is transferred into the e820map,
|
|
* and in init.c/numa.c, that new information is used to mark pages
|
|
* reserved or not.
|
|
*/
|
|
#ifndef __E820_HEADER
|
|
#define __E820_HEADER
|
|
|
|
#include <linux/ioport.h>
|
|
|
|
#ifndef __ASSEMBLY__
|
|
extern void setup_memory_region(void);
|
|
extern void contig_e820_setup(void);
|
|
extern unsigned long e820_end_of_ram(void);
|
|
extern void e820_reserve_resources(void);
|
|
extern void e820_mark_nosave_regions(void);
|
|
extern int e820_any_non_reserved(unsigned long start, unsigned long end);
|
|
extern int is_memory_any_valid(unsigned long start, unsigned long end);
|
|
extern int e820_all_non_reserved(unsigned long start, unsigned long end);
|
|
extern int is_memory_all_valid(unsigned long start, unsigned long end);
|
|
extern unsigned long e820_hole_size(unsigned long start, unsigned long end);
|
|
|
|
extern void e820_register_active_regions(int nid, unsigned long start_pfn,
|
|
unsigned long end_pfn);
|
|
|
|
extern void finish_e820_parsing(void);
|
|
|
|
#endif/*!__ASSEMBLY__*/
|
|
|
|
#endif/*__E820_HEADER*/
|