diff options
author | David S. Miller <davem@davemloft.net> | 2010-02-17 16:20:14 -0800 |
---|---|---|
committer | David S. Miller <davem@davemloft.net> | 2010-02-17 16:20:14 -0800 |
commit | 8c2fcadc933f713d51f46ec4dcd9b12830e0df84 (patch) | |
tree | e0797b2db664d702f9d02dd0f45efddb2f0d7fe9 /arch/x86/kernel/smpboot.c | |
parent | 232486e1e9f34889424b68ee6270440b554479a2 (diff) | |
parent | b0483e78e5c4c9871fc5541875b3bc006846d46b (diff) | |
download | kernel-crypto-8c2fcadc933f713d51f46ec4dcd9b12830e0df84.tar.gz kernel-crypto-8c2fcadc933f713d51f46ec4dcd9b12830e0df84.tar.xz kernel-crypto-8c2fcadc933f713d51f46ec4dcd9b12830e0df84.zip |
Merge branch 'master' of /home/davem/src/GIT/linux-2.6/
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 678d0b8c26f..b4e870cbdc6 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"); |