aboutsummaryrefslogtreecommitdiffstats
path: root/include/asm-x86/e820.h
diff options
context:
space:
mode:
authorYinghai Lu <yhlu.kernel@gmail.com>2008-06-10 15:55:54 -0400
committerIngo Molnar <mingo@elte.hu>2008-07-08 04:35:38 -0400
commitab4a465e96adf2f3a8aaa95384bacfa9ab661e35 (patch)
treea4c72ba76c93ff362b404106f6a6ce756a2075cf /include/asm-x86/e820.h
parentdf5f6c212cc049d1989b5ce71bb863a367c261e9 (diff)
x86: e820 merge parsing of the mem=/memmap= boot parameters
since we now have 32-bit support for e820_register_active_regions(), we can merge the parsing of the mem=/memmap= boot parameters. 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.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/include/asm-x86/e820.h b/include/asm-x86/e820.h
index 8aa32323a182..a5959e3a5626 100644
--- a/include/asm-x86/e820.h
+++ b/include/asm-x86/e820.h
@@ -98,6 +98,8 @@ extern int e820_find_active_region(const struct e820entry *ei,
98extern void e820_register_active_regions(int nid, unsigned long start_pfn, 98extern void e820_register_active_regions(int nid, unsigned long start_pfn,
99 unsigned long end_pfn); 99 unsigned long end_pfn);
100extern u64 e820_hole_size(u64 start, u64 end); 100extern u64 e820_hole_size(u64 start, u64 end);
101extern void finish_e820_parsing(void);
102
101#endif /* __ASSEMBLY__ */ 103#endif /* __ASSEMBLY__ */
102 104
103#define ISA_START_ADDRESS 0xa0000 105#define ISA_START_ADDRESS 0xa0000