diff options
| author | Thomas Gleixner | 2015-01-15 22:22:44 +0100 |
|---|---|---|
| committer | Thomas Gleixner | 2015-01-22 15:10:56 +0100 |
| commit | 374aab339f10f0510cec0e79d752d31d84b08aa2 (patch) | |
| tree | fffeaf1be404f54562d07e7ecaaf215ce431c435 /arch/x86/kernel/smpboot.c | |
| parent | x86/smpboot: Sanitize uniprocessor init (diff) | |
| download | kernel-qcow2-linux-374aab339f10f0510cec0e79d752d31d84b08aa2.tar.gz kernel-qcow2-linux-374aab339f10f0510cec0e79d752d31d84b08aa2.tar.xz kernel-qcow2-linux-374aab339f10f0510cec0e79d752d31d84b08aa2.zip | |
x86/apic: Reuse apic_bsp_setup() for UP APIC setup
Extend apic_bsp_setup() so the same code flow can be used for
APIC_init_uniprocessor().
Folded Jiangs fix to provide proper ordering of the UP setup.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Jiang Liu <jiang.liu@linux.intel.com>
Cc: Joerg Roedel <joro@8bytes.org>
Cc: Tony Luck <tony.luck@intel.com>
Cc: Borislav Petkov <bp@alien8.de>
Link: http://lkml.kernel.org/r/20150115211704.084765674@linutronix.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/smpboot.c')
| -rw-r--r-- | arch/x86/kernel/smpboot.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/smpboot.c b/arch/x86/kernel/smpboot.c index fe8783d500c2..0a46e5e4fa1f 100644 --- a/arch/x86/kernel/smpboot.c +++ b/arch/x86/kernel/smpboot.c @@ -1147,7 +1147,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) return; case SMP_FORCE_UP: disable_smp(); - apic_bsp_setup(); + apic_bsp_setup(false); return; case SMP_OK: break; @@ -1161,7 +1161,7 @@ void __init native_smp_prepare_cpus(unsigned int max_cpus) /* Or can we switch back to PIC here? */ } - cpu0_logical_apicid = apic_bsp_setup(); + cpu0_logical_apicid = apic_bsp_setup(false); /* * Set up local APIC timer on boot CPU. |