git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'linus' into x86/core
[sfrench/cifs-2.6.git]
/
arch
/
x86
/
kernel
/
mpparse.c
diff --git
a/arch/x86/kernel/mpparse.c
b/arch/x86/kernel/mpparse.c
index 678090508a6240996aee5eedbdd5774cc86ab629..e5d23675bb7cc9acb106e323a82724f1e5b40409 100644
(file)
--- a/
arch/x86/kernel/mpparse.c
+++ b/
arch/x86/kernel/mpparse.c
@@
-397,7
+397,9
@@
static int __init smp_read_mpc(struct mp_config_table *mpc, unsigned early)
generic_bigsmp_probe();
#endif
+#ifdef CONFIG_X86_32
setup_apic_routing();
+#endif
if (!num_processors)
printk(KERN_ERR "MPTABLE: no processors registered!\n");
return num_processors;