diff options
author | Suresh Siddha <suresh.b.siddha@intel.com> | 2010-08-27 14:09:50 -0400 |
---|---|---|
committer | H. Peter Anvin <hpa@linux.intel.com> | 2010-09-15 20:37:10 -0400 |
commit | fa47f7e52874683a9659df2f1f143105f676dc0f (patch) | |
tree | 26e18f3c0dce1873fcffeba50cee18769e83e079 /arch/x86/kernel/apic/apic.c | |
parent | 62a92f4c69cd1d9361ad8c16be1dd16e6821bc15 (diff) |
x86, x2apic: Simplify apic init in SMP and UP builds
Move enable_IR_x2apic() inside the default_setup_apic_routing(),
and for SMP platforms, move the default_setup_apic_routing() after
smp_sanity_check(). This cleans up the code that tries to avoid multiple
calls to default_setup_apic_routing() when smp_sanity_check() fails (which
goes through the APIC_init_uniprocessor() path).
Signed-off-by: Suresh Siddha <suresh.b.siddha@intel.com>
LKML-Reference: <20100827181049.173087246@sbsiddha-MOBL3.sc.intel.com>
Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>
Diffstat (limited to 'arch/x86/kernel/apic/apic.c')
-rw-r--r-- | arch/x86/kernel/apic/apic.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/apic/apic.c b/arch/x86/kernel/apic/apic.c index e3b534cda49a..8cf86fb3b4e3 100644 --- a/arch/x86/kernel/apic/apic.c +++ b/arch/x86/kernel/apic/apic.c | |||
@@ -1665,10 +1665,7 @@ int __init APIC_init_uniprocessor(void) | |||
1665 | } | 1665 | } |
1666 | #endif | 1666 | #endif |
1667 | 1667 | ||
1668 | #ifndef CONFIG_SMP | ||
1669 | enable_IR_x2apic(); | ||
1670 | default_setup_apic_routing(); | 1668 | default_setup_apic_routing(); |
1671 | #endif | ||
1672 | 1669 | ||
1673 | verify_local_APIC(); | 1670 | verify_local_APIC(); |
1674 | connect_bsp_APIC(); | 1671 | connect_bsp_APIC(); |