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

Commit ab5a5be0 authored Jun 08, 2008 by Ingo Molnar

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

This reverts commit 2229ff84f01746d02fb6b79e156fb5cce48c908f.

A better fix from Maciej will be merged.

parent ff11571b

arch/x86/kernel/apic_32.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -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 */

arch/x86/kernel/apic_64.c

+2 −4

Original line number	Original line	Diff line number	Diff line
	@@ -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();
	}		}