diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-31 12:59:43 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2008-07-31 12:59:43 +1000 |
| commit | 6cb3491ad3009ea190b2fe72af8ba601d330cf9b (patch) | |
| tree | 1d4f1789d021f623dae66c3c9a9666d70a97f835 /arch/x86/kernel/mpparse.c | |
| parent | 2ef0ff4d6f727d87463d324f338941c56b2c6bb0 (diff) | |
| parent | b6738526435d40218e1bd9c5a2ff793361d55e7a (diff) | |
Merge commit 'x86/auto-x86-next'
Conflicts:
arch/x86/kernel/genapic_64.c
drivers/pci/dmar.c
Diffstat (limited to 'arch/x86/kernel/mpparse.c')
| -rw-r--r-- | arch/x86/kernel/mpparse.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/kernel/mpparse.c b/arch/x86/kernel/mpparse.c index 6ae005ccaed8..e362c6ab4d35 100644 --- 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; |