diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-03 19:34:00 -0700 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-06-04 12:01:57 +0200 |
commit | ee0c80fadfa56bf4f9d90c1c023429a6bd8edd69 (patch) | |
tree | 74139bd2a4437a327fc65a00cafb42549d601670 /include | |
parent | 84b56fa46b36c2df508e7d421feab514fad30f81 (diff) |
x86: move e820_register_active() to e820.c
to prepare 32-bit to use it.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include')
-rw-r--r-- | include/asm-x86/e820.h | 11 | ||||
-rw-r--r-- | include/asm-x86/e820_64.h | 5 |
2 files changed, 11 insertions, 5 deletions
diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h index ee8fe4c5da4..44ed9c0a4df 100644 --- a/include/asm-x86/e820.h +++ b/include/asm-x86/e820.h @@ -79,6 +79,8 @@ static inline void e820_mark_nosave_regions(unsigned long limit_pfn) } #endif +extern unsigned long end_user_pfn; + extern u64 find_e820_area(u64 start, u64 end, u64 size, u64 align); extern u64 find_e820_area_size(u64 start, u64 *sizep, u64 align); extern void reserve_early(u64 start, u64 end, char *name); @@ -86,6 +88,15 @@ extern void free_early(u64 start, u64 end); extern void early_res_to_bootmem(u64 start, u64 end); extern u64 early_reserve_e820(u64 startt, u64 sizet, u64 align); +extern unsigned long e820_end_of_ram(void); +extern int e820_find_active_region(const struct e820entry *ei, + unsigned long start_pfn, + unsigned long last_pfn, + unsigned long *ei_startpfn, + unsigned long *ei_endpfn); +extern void e820_register_active_regions(int nid, unsigned long start_pfn, + unsigned long end_pfn); +extern u64 e820_hole_size(u64 start, u64 end); #endif /* __ASSEMBLY__ */ #define ISA_START_ADDRESS 0xa0000 diff --git a/include/asm-x86/e820_64.h b/include/asm-x86/e820_64.h index 917963ccab6..368585daaa4 100644 --- a/include/asm-x86/e820_64.h +++ b/include/asm-x86/e820_64.h @@ -16,16 +16,11 @@ #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 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); |