summaryrefslogtreecommitdiff
path: root/arch/x86/kernel/mpparse.c
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2010-02-20 13:53:16 -0800
committerDavid S. Miller <davem@davemloft.net>2010-02-20 13:53:16 -0800
commit198d2f63a6096fe575b696b13ba61b62c620266f (patch)
treed0c2b0697370cc670029cd1eb2a80c35c71eac60 /arch/x86/kernel/mpparse.c
parent0da2b300b91ddeb9944c3fb4faaf78c1c482c0af (diff)
parent1f474646fdc36b457606bbcd6a3592e6cbd31ac4 (diff)
downloadlinux-198d2f63a6096fe575b696b13ba61b62c620266f.tar.gz
linux-198d2f63a6096fe575b696b13ba61b62c620266f.tar.bz2
linux-198d2f63a6096fe575b696b13ba61b62c620266f.zip
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
-rw-r--r--arch/x86/kernel/mpparse.c7
1 files changed, 0 insertions, 7 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c
index 40b54ceb68b5..a2c1edd2d3ac 100644
--- a/arch/x86/kernel/mpparse.c
+++ b/arch/x86/kernel/mpparse.c
@@ -359,13 +359,6 @@ static int __init smp_read_mpc(struct mpc_table *mpc, unsigned early)
x86_init.mpparse.mpc_record(1);
}
-#ifdef CONFIG_X86_BIGSMP
- generic_bigsmp_probe();
-#endif
-
- if (apic->setup_apic_routing)
- apic->setup_apic_routing();
-
if (!num_processors)
printk(KERN_ERR "MPTABLE: no processors registered!\n");
return num_processors;