[PATCH 2/3] OProfile: needed fix to IO-APIC timer

[John Levon]

Retransmit of a critical fix to the IO-APIC timer support. By Zwane Mwaikambo. Please apply

diff -Naur -X dontdiff linux-cvs/arch/i386/kernel/nmi.c linux-fixes/arch/i386/kernel/nmi.c
--- linux-cvs/arch/i386/kernel/nmi.c	2003-06-18 15:06:05.000000000 +0100
+++ linux-fixes/arch/i386/kernel/nmi.c	2003-06-18 23:09:49.000000000 +0100
@@ -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);
 	}
 }