diff options
| author | Ingo Molnar <mingo@elte.hu> | 2011-02-16 09:44:04 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2011-02-16 09:44:15 +0100 |
| commit | 52b8b8d7251f8f7b8ed4a6c623618106d83e18b5 (patch) | |
| tree | 13ee81932cba73deb69cd3f386d80e45e6ac23de /arch/x86/kernel/setup.c | |
| parent | 02ac81a812fe0575a8475a93bdc22fb291ebad91 (diff) | |
| parent | 14392fd329eca9b59d51c0aa5d0acfb4965424d1 (diff) | |
| download | blackbird-op-linux-52b8b8d7251f8f7b8ed4a6c623618106d83e18b5.tar.gz blackbird-op-linux-52b8b8d7251f8f7b8ed4a6c623618106d83e18b5.zip | |
Merge branch 'x86/numa' into x86/mm
Merge reason: consolidate it into the more generic x86/mm tree to prevent conflicts.
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 6b286d879a25..ac909ba297b9 100644 --- a/arch/x86/kernel/setup.c +++ b/arch/x86/kernel/setup.c @@ -1047,9 +1047,7 @@ void __init setup_arch(char **cmdline_p) prefill_possible_map(); -#ifdef CONFIG_X86_64 init_cpu_to_node(); -#endif init_apic_mappings(); ioapic_and_gsi_init(); |
