diff options
author | Alexander van Heukelum <heukelum@mailshack.com> | 2008-04-23 09:09:05 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2008-05-25 04:55:09 -0400 |
commit | 0dbfafa5fcd4dd189e2adc7b6ed9e0405e846d79 (patch) | |
tree | 6b3b9ea6a8c9b7163719e4f68772812c74f17168 /include/asm-x86 | |
parent | 0da72a4aeb4482c64c1142a2e36b556d13374937 (diff) |
x86: move i386 memory setup code to e820_32.c
The x86_64 code has centralized the memory setup code in
e820_64.c. This patch copies that approach to i386:
- early_param("mem", ...) parsing is moved from
setup_32.c to e820_32.c.
- setup_memory_map() and finish_e820_parsing() are
factored out from setup_arch(), and declarations
are added to e820_32.h.
- print_memory_map() is made static and removed from
e820_32.h.
- user_defined_memmap is marked as __initdata.
Signed-off-by: Alexander van Heukelum <heukelum@fastmail.fm>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/e820_32.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/include/asm-x86/e820_32.h b/include/asm-x86/e820_32.h index a9f7c6ec32bf..e1f10c60901f 100644 --- a/include/asm-x86/e820_32.h +++ b/include/asm-x86/e820_32.h | |||
@@ -18,6 +18,9 @@ | |||
18 | 18 | ||
19 | #ifndef __ASSEMBLY__ | 19 | #ifndef __ASSEMBLY__ |
20 | 20 | ||
21 | extern void setup_memory_map(void); | ||
22 | extern void finish_e820_parsing(void); | ||
23 | |||
21 | extern struct e820map e820; | 24 | extern struct e820map e820; |
22 | extern void update_e820(void); | 25 | extern void update_e820(void); |
23 | 26 | ||
@@ -32,7 +35,6 @@ extern void update_memory_range(u64 start, u64 size, unsigned old_type, | |||
32 | unsigned new_type); | 35 | unsigned new_type); |
33 | extern void e820_register_memory(void); | 36 | extern void e820_register_memory(void); |
34 | extern void limit_regions(unsigned long long size); | 37 | extern void limit_regions(unsigned long long size); |
35 | extern void print_memory_map(char *who); | ||
36 | extern void init_iomem_resources(struct resource *code_resource, | 38 | extern void init_iomem_resources(struct resource *code_resource, |
37 | struct resource *data_resource, | 39 | struct resource *data_resource, |
38 | struct resource *bss_resource); | 40 | struct resource *bss_resource); |