diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-02-15 06:49:37 +0100 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-02-15 06:49:37 +0100 |
| commit | 028c5d5d596651bce13d06737eb3707a7e99a30c (patch) | |
| tree | e4e429858a19635ad2b5aa563bf1b4e39396d4e2 /arch/x86/kernel/smpboot.c | |
| parent | sh64: fix up memory offset calculation. (diff) | |
| parent | sh64: fix tracing of signals. (diff) | |
| download | linux-028c5d5d596651bce13d06737eb3707a7e99a30c.tar.xz linux-028c5d5d596651bce13d06737eb3707a7e99a30c.zip | |
Merge branch 'sh/stable-updates'
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index 678d0b8c26f3..b4e870cbdc60 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1083,9 +1083,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) set_cpu_sibling_map(0); enable_IR_x2apic(); -#ifdef CONFIG_X86_64 default_setup_apic_routing(); -#endif if (smp_sanity_check(max_cpus) < 0) { printk(KERN_INFO "SMP disabled\n"); |