x86, x2apic: Simplify apic init in SMP and UP builds
commitfa47f7e52874683a9659df2f1f143105f676dc0f
authorSuresh Siddha <suresh.b.siddha@intel.com>
Fri, 27 Aug 2010 18:09:50 +0000 (27 11:09 -0700)
committerH. Peter Anvin <hpa@linux.intel.com>
Thu, 16 Sep 2010 00:37:10 +0000 (15 17:37 -0700)
tree26e18f3c0dce1873fcffeba50cee18769e83e079
parent62a92f4c69cd1d9361ad8c16be1dd16e6821bc15
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>
arch/x86/kernel/apic/apic.c
arch/x86/kernel/apic/probe_64.c
arch/x86/kernel/smpboot.c