lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "x86, io-apic: fix nmi_watchdog=1 bootup hang"

Browse Source 
This reverts commit 2229ff84f01746d02fb6b79e156fb5cce48c908f.

A better fix from Maciej will be merged.
This commit is contained in:
Ingo Molnar
2008-06-08 10:13:33 +02:00
parent ff11571b25
commit ab5a5be099
2 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
arch/x86/kernel/apic_32.c
View File

@@ -541,13 +541,11 @@ void __init setup_boot_APIC_clock(void)
* PIT/HPET going. Otherwise register lapic as a dummy * PIT/HPET going. Otherwise register lapic as a dummy
* device. * device.
*/ */
if (nmi_watchdog != NMI_IO_APIC) { if (nmi_watchdog != NMI_IO_APIC)
lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY; lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY;
} else { else
printk(KERN_WARNING "APIC timer registered as dummy," printk(KERN_WARNING "APIC timer registered as dummy,"
" due to nmi_watchdog=1!\n"); " due to nmi_watchdog=1!\n");
timer_through_8259 = 1;
}
} }
/* Setup the lapic or request the broadcast */ /* Setup the lapic or request the broadcast */

6
arch/x86/kernel/apic_64.c
View File

@@ -413,13 +413,11 @@ void __init setup_boot_APIC_clock(void)
* PIT/HPET going. Otherwise register lapic as a dummy * PIT/HPET going. Otherwise register lapic as a dummy
* device. * device.
*/ */
if (nmi_watchdog != NMI_IO_APIC) { if (nmi_watchdog != NMI_IO_APIC)
lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY; lapic_clockevent.features &= ~CLOCK_EVT_FEAT_DUMMY;
} else { else
printk(KERN_WARNING "APIC timer registered as dummy," printk(KERN_WARNING "APIC timer registered as dummy,"
" due to nmi_watchdog=1!\n"); " due to nmi_watchdog=1!\n");
timer_through_8259 = 1;
}
setup_APIC_timer(); setup_APIC_timer();
} }