The Linux Kernel Mailing List
 help / color / mirror / Atom feed
* [PATCH] OProfile: IO-APIC fixup
@ 2003-06-18 21:59 John Levon
  2003-06-18 22:23 ` Linus Torvalds
  0 siblings, 1 reply; 4+ messages in thread
From: John Levon @ 2003-06-18 21:59 UTC (permalink / raw)
  To: torvalds, linux-kernel


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

regards,
john

p.s. can/should we use torvalds@osdl.org already ?

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);
 	}
 }
 

^ permalink raw reply	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2003-06-18 22:43 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2003-06-18 21:59 [PATCH] OProfile: IO-APIC fixup John Levon
2003-06-18 22:23 ` Linus Torvalds
2003-06-18 22:35   ` Eli Carter
2003-06-18 22:54     ` Linus Torvalds

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox