diff options
Diffstat (limited to 'arch/x86/kernel/irqinit.c')
| -rw-r--r-- | arch/x86/kernel/irqinit.c | 9 | 
1 files changed, 7 insertions, 2 deletions
diff --git a/arch/x86/kernel/irqinit.c b/arch/x86/kernel/irqinit.c index a539410c4ea9..772196c1b8c4 100644 --- a/arch/x86/kernel/irqinit.c +++ b/arch/x86/kernel/irqinit.c @@ -61,9 +61,14 @@ 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) +	/* +	 * Try to set up the through-local-APIC virtual wire mode earlier. +	 * +	 * On some 32-bit UP machines, whose APIC has been disabled by BIOS +	 * and then got re-enabled by "lapic", it hangs at boot time without this. +	 */  	init_bsp_APIC(); -#endif +  	legacy_pic->init(0);  	for (i = 0; i < nr_legacy_irqs(); i++)  |