2 files changed, 2 insertions, 2 deletions
diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c
index a76e93146585..2dd928a84645 100644
--- a/arch/i386/kernel/nmi.c
+++ b/arch/i386/kernel/nmi.c
@@ -107,7 +107,7 @@ int nmi_active;
 static __init void nmi_cpu_busy(void *data)
 {
        volatile int *endflag = data;
-        local_irq_enable();
+        local_irq_enable_in_hardirq();
        /* Intentionally don't use cpu_relax here. This is
           to make sure that the performance counter really ticks,
           even if there is a simulator or similar that catches the
diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c
index 476c1472fc07..5baa0c726e97 100644
--- a/arch/x86_64/kernel/nmi.c
+++ b/arch/x86_64/kernel/nmi.c
@@ -127,7 +127,7 @@ void __cpuinit nmi_watchdog_default(void)
 static __init void nmi_cpu_busy(void *data)
 {
        volatile int *endflag = data;
-        local_irq_enable();
+        local_irq_enable_in_hardirq();
        /* Intentionally don't use cpu_relax here. This is
           to make sure that the performance counter really ticks,
           even if there is a simulator or similar that catches the

diff --git a/arch/i386/kernel/nmi.c b/arch/i386/kernel/nmi.c index a76e93146585..2dd928a84645 100644 --- a/arch/i386/kernel/nmi.c +++ b/arch/i386/kernel/nmi.c
@@ -107,7 +107,7 @@ int nmi_active;
107	static __init void nmi_cpu_busy(void *data)	107	static __init void nmi_cpu_busy(void *data)
108	{	108	{
109	volatile int *endflag = data;	109	volatile int *endflag = data;
110	local_irq_enable();	110	local_irq_enable_in_hardirq();
111	/* Intentionally don't use cpu_relax here. This is	111	/* Intentionally don't use cpu_relax here. This is
112	to make sure that the performance counter really ticks,	112	to make sure that the performance counter really ticks,
113	even if there is a simulator or similar that catches the	113	even if there is a simulator or similar that catches the


diff --git a/arch/x86_64/kernel/nmi.c b/arch/x86_64/kernel/nmi.c index 476c1472fc07..5baa0c726e97 100644 --- a/arch/x86_64/kernel/nmi.c +++ b/arch/x86_64/kernel/nmi.c
@@ -127,7 +127,7 @@ void __cpuinit nmi_watchdog_default(void)
127	static __init void nmi_cpu_busy(void *data)	127	static __init void nmi_cpu_busy(void *data)
128	{	128	{
129	volatile int *endflag = data;	129	volatile int *endflag = data;
130	local_irq_enable();	130	local_irq_enable_in_hardirq();
131	/* Intentionally don't use cpu_relax here. This is	131	/* Intentionally don't use cpu_relax here. This is
132	to make sure that the performance counter really ticks,	132	to make sure that the performance counter really ticks,
133	even if there is a simulator or similar that catches the	133	even if there is a simulator or similar that catches the