Commit 2c2643a7 authored by John Levon's avatar John Levon Committed by Linus Torvalds

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

Critical fix to the IO-APIC timer support. By Zwane Mwaikambo.
parent 0c4aa1fd
...@@ -189,7 +189,6 @@ void disable_timer_nmi_watchdog(void) ...@@ -189,7 +189,6 @@ void disable_timer_nmi_watchdog(void)
if ((nmi_watchdog != NMI_IO_APIC) || (nmi_active <= 0)) if ((nmi_watchdog != NMI_IO_APIC) || (nmi_active <= 0))
return; return;
disable_irq(0);
unset_nmi_callback(); unset_nmi_callback();
nmi_active = -1; nmi_active = -1;
nmi_watchdog = NMI_NONE; nmi_watchdog = NMI_NONE;
...@@ -201,7 +200,6 @@ void enable_timer_nmi_watchdog(void) ...@@ -201,7 +200,6 @@ void enable_timer_nmi_watchdog(void)
nmi_watchdog = NMI_IO_APIC; nmi_watchdog = NMI_IO_APIC;
touch_nmi_watchdog(); touch_nmi_watchdog();
nmi_active = 1; nmi_active = 1;
enable_irq(0);
} }
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment