Messages in this thread Patch in this message | | | Date | Wed, 18 Jun 2003 22:59:33 +0100 | From | John Levon <> | Subject | [PATCH] 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 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); } } - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
| |