diff options
author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-06-23 06:05:30 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 06:50:20 -0400 |
commit | 2ec65f8b89ea003c27ff7723525a2ee335a2b393 (patch) | |
tree | 9b8718be2017f619b2a0185492315b85ea1731fa /include/asm-x86 | |
parent | bef1568d9714f1162086c32583ba7984a7ca8e3e (diff) |
x86: clean up using max_low_pfn on 32-bit
so that max_low_pfn is not changed after it is set.
so we can move that early and out of initmem_init.
could call find_low_pfn_range just after max_pfn is set.
also could move reserve_initrd out of setup_bootmem_allocator
so 32bit is more like 64bit.
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/asm-x86')
-rw-r--r-- | include/asm-x86/page_32.h | 3 | ||||
-rw-r--r-- | include/asm-x86/setup.h | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/include/asm-x86/page_32.h b/include/asm-x86/page_32.h index a0713d175f45..3810d14051e8 100644 --- a/include/asm-x86/page_32.h +++ b/include/asm-x86/page_32.h | |||
@@ -92,7 +92,8 @@ extern int sysctl_legacy_va_layout; | |||
92 | #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) | 92 | #define VMALLOC_RESERVE ((unsigned long)__VMALLOC_RESERVE) |
93 | #define MAXMEM (-__PAGE_OFFSET - __VMALLOC_RESERVE) | 93 | #define MAXMEM (-__PAGE_OFFSET - __VMALLOC_RESERVE) |
94 | 94 | ||
95 | extern unsigned long initmem_init(unsigned long, unsigned long); | 95 | extern void find_low_pfn_range(void); |
96 | extern void initmem_init(unsigned long, unsigned long); | ||
96 | extern void zone_sizes_init(void); | 97 | extern void zone_sizes_init(void); |
97 | extern void setup_bootmem_allocator(void); | 98 | extern void setup_bootmem_allocator(void); |
98 | 99 | ||
diff --git a/include/asm-x86/setup.h b/include/asm-x86/setup.h index 8f85b2450562..bb12a1619c12 100644 --- a/include/asm-x86/setup.h +++ b/include/asm-x86/setup.h | |||
@@ -39,8 +39,6 @@ void reserve_crashkernel(void); | |||
39 | #include <asm/bootparam.h> | 39 | #include <asm/bootparam.h> |
40 | 40 | ||
41 | void reserve_standard_io_resources(void); | 41 | void reserve_standard_io_resources(void); |
42 | void reserve_initrd(void); | ||
43 | |||
44 | 42 | ||
45 | #ifndef _SETUP | 43 | #ifndef _SETUP |
46 | 44 | ||