diff options
| author | Yinghai Lu <yhlu.kernel@gmail.com> | 2008-07-02 00:31:02 -0700 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-08 13:16:22 +0200 |
| commit | cb95a13a8ace8612ecab042a838e5aab2ec14ef0 (patch) | |
| tree | 55c1a4852488265074e44b645520a3e7c5da3128 /arch/x86/kernel/setup.c | |
| parent | d9a81b4411d53196c4535c3a1258cb03d945c718 (diff) | |
x86: merge zones_sizes_init for numa and non numa on 32-bit
move out e820_register_active_regions from non numa zones_sizes_init()
and remove numa version zones_sizes_init().
and let 32 bit call remove_all_active_ranges() in setup_arch() directly
like 64-bit
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/setup.c')
| -rw-r--r-- | arch/x86/kernel/setup.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c index 4ac01d0ce62..d5de157b02a 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -749,10 +749,8 @@ void __init setup_arch(char **cmdline_p) */ acpi_boot_table_init(); -#ifdef CONFIG_X86_64 /* Remove active ranges so rediscovery with NUMA-awareness happens */ remove_all_active_ranges(); -#endif #ifdef CONFIG_ACPI_NUMA /* |