OProfile: IO-APIC fixup

Follow-on patch to the NMI timer patch, from Zwane Mwaikambo. Please apply.

regards,
john

p.s. can/should we use [email protected] already ?

diff -Naur -X dontdiff linux-cvs/arch/i386/kernel/nmi.c linux-fixes/arch/i386/kernel/nmi.c
@@ -189,7 +189,6 @@
 	if ((nmi_watchdog != NMI_IO_APIC) || (nmi_active <= 0))
 		return;
 
-	disable_irq(0);
 	unset_nmi_callback();
 	nmi_active = -1;
 	nmi_watchdog = NMI_NONE;

@@ -201,7 +200,6 @@
 		nmi_watchdog = NMI_IO_APIC;
 		touch_nmi_watchdog();
 		nmi_active = 1;
-		enable_irq(0);
 	}
 }
 

It should work, and you might as well start testing it. I still have my mail sending side set up for transmeta, so you'd get replies through the old address, but the more testing the merrier..

Linus

I can hear it now... "OPT-IN! Woohoo!"

;P

Eli
--------------------. "If it ain't broke now,
Eli Carter \ it will be soon." -- crypto-gram
eli.carter(a)inet.com `-------------------------------------------------

Hey, nobody reads emails without spam filtering these days, do they? I get 300 spams a day, and I don't even notice any more.

Linus