Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e90955c2 authored by Jesse Barnes's avatar Jesse Barnes Committed by Ingo Molnar
Browse files

x86: fix PCI MSI breaks when booting with nosmp 



set up sane APIC state even in the nosmp case.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 97520825

arch/x86/kernel/smpboot.c

+3 −7
Original line number Original line Diff line number Diff line
@@ -1149,14 +1149,10 @@ static int __init smp_sanity_check(unsigned max_cpus) 
				 "forcing use of dummy APIC emulation.\n");

				 "forcing use of dummy APIC emulation.\n");

		smpboot_clear_io_apic();

		smpboot_clear_io_apic();

#ifdef CONFIG_X86_32

#ifdef CONFIG_X86_32

		if (nmi_watchdog == NMI_LOCAL_APIC) {

			printk(KERN_INFO "activating minimal APIC for"

					 "NMI watchdog use.\n");

		connect_bsp_APIC();

		connect_bsp_APIC();

#endif

		setup_local_APIC();

		setup_local_APIC();

		end_local_APIC_setup();

		end_local_APIC_setup();

		}

#endif

		return -1;

		return -1;

	}

	}