diff options
author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2017-11-28 16:53:50 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2018-01-14 12:14:51 +0100 |
commit | fc90ccfd286eabb05ec54521367df8663cf0bbbf (patch) | |
tree | 0300985a44c469db156e4f4fb2fd4b05a11a0f57 /arch/x86/kernel/irqinit.c | |
parent | beacd6f7ed5e2915959442245b3b2480c2e37490 (diff) | |
download | linux-stable-fc90ccfd286eabb05ec54521367df8663cf0bbbf.tar.gz linux-stable-fc90ccfd286eabb05ec54521367df8663cf0bbbf.tar.bz2 linux-stable-fc90ccfd286eabb05ec54521367df8663cf0bbbf.zip |
Revert "x86/apic: Remove init_bsp_APIC()"
This reverts commit b371ae0d4a194b178817b0edfb6a7395c7aec37a. It causes
boot hangs on old P3/P4 systems when the local APIC is enforced in UP mode.
Reported-by: Meelis Roos <mroos@linux.ee>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Dou Liyang <douly.fnst@cn.fujitsu.com>
Cc: yinghai@kernel.org
Cc: bhe@redhat.com
Link: https://lkml.kernel.org/r/20171128145350.21560-1-ville.syrjala@linux.intel.com
Diffstat (limited to 'arch/x86/kernel/irqinit.c')
-rw-r--r-- | arch/x86/kernel/irqinit.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index 8da3e909e967..a539410c4ea9 100644 --- a/arch/x86/kernel/irqinit.c +++ b/arch/x86/kernel/irqinit.c @@ -61,6 +61,9 @@ void __init init_ISA_irqs(void) struct irq_chip *chip = legacy_pic->chip; int i; +#if defined(CONFIG_X86_64) || defined(CONFIG_X86_LOCAL_APIC) + init_bsp_APIC(); +#endif legacy_pic->init(0); for (i = 0; i < nr_legacy_irqs(); i++) |