aboutsummaryrefslogtreecommitdiff
path: root/arch/x86
diff options
context:
space:
mode:
authorBin Meng2016-05-22 01:45:32 -0700
committerBin Meng2016-05-23 15:27:41 +0800
commitaaaa55751ab1e5a5cfa0962d604593a7e6f33ff6 (patch)
tree4c0cb892dc125f6fad11267ce777c51556ff2653 /arch/x86
parent3299be2479f9878dd3bb484f2b8f1ef7c0a20fb4 (diff)
x86: Remove SMP limitation in lapic_setup()
At present LAPIC is enabled and configured as virtual wire mode in lapic_setup() only when CONFIG_SMP is on. This limitation is however not necessary as for uniprocessor this is still needed. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'arch/x86')
-rw-r--r--arch/x86/cpu/lapic.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/arch/x86/cpu/lapic.c b/arch/x86/cpu/lapic.c
index dbb32c4447d..fbea2d15728 100644
--- a/arch/x86/cpu/lapic.c
+++ b/arch/x86/cpu/lapic.c
@@ -124,7 +124,6 @@ int lapic_remote_read(int apicid, int reg, unsigned long *pvalue)
void lapic_setup(void)
{
-#ifdef CONFIG_SMP
/* Only Pentium Pro and later have those MSR stuff */
debug("Setting up local apic: ");
@@ -154,11 +153,7 @@ void lapic_setup(void)
LAPIC_DELIVERY_MODE_NMI));
debug("apic_id: 0x%02lx, ", lapicid());
-#else /* !CONFIG_SMP */
- /* Only Pentium Pro and later have those MSR stuff */
- debug("Disabling local apic: ");
- disable_lapic();
-#endif /* CONFIG_SMP */
+
debug("done.\n");
post_code(POST_LAPIC);
}