Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e90955c26d8af318658c45caadb1d330ac6a506c

Authored by Jesse Barnes
Committed by Ingo Molnar
1 parent 9752082560
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

x86: fix PCI MSI breaks when booting with nosmp 

set up sane APIC state even in the nosmp case.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 1 changed file with 3 additions and 7 deletions Side-by-side Diff

arch/x86/kernel/smpboot.c
Diff comments   View file @ e90955c
... ... @@ -1149,14 +1149,10 @@
1149 1149 "forcing use of dummy APIC emulation.\n");
1150 1150 smpboot_clear_io_apic();
1151 1151 #ifdef CONFIG_X86_32
1152   - if (nmi_watchdog == NMI_LOCAL_APIC) {
1153   - printk(KERN_INFO "activating minimal APIC for"
1154   - "NMI watchdog use.\n");
1155   - connect_bsp_APIC();
1156   - setup_local_APIC();
1157   - end_local_APIC_setup();
1158   - }
  1152 + connect_bsp_APIC();
1159 1153 #endif
  1154 + setup_local_APIC();
  1155 + end_local_APIC_setup();
1160 1156 return -1;
1161 1157 }
1162 1158