X-Git-Url: https://git.stricted.de/?a=blobdiff_plain;f=kernel%2Fstop_machine.c;h=fcee2a8e6da37a79a02a09a4dfaca30887098292;hb=c283f5dbe31920ca70b80a594a97bfaa2a28be13;hp=daabb74ee0bc2648dda71286eb0331074af5f28b;hpb=a9deecba19b8f384d97f82c75379da48bccb2588;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index daabb74ee0bc..fcee2a8e6da3 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -8,6 +8,8 @@
 #include <linux/sched.h>
 #include <linux/stop_machine.h>
 #include <linux/syscalls.h>
+#include <linux/interrupt.h>
+
 #include <asm/atomic.h>
 #include <asm/semaphore.h>
 #include <asm/uaccess.h>
@@ -45,6 +47,7 @@ static int stopmachine(void *cpu)
 		if (stopmachine_state == STOPMACHINE_DISABLE_IRQ 
 		    && !irqs_disabled) {
 			local_irq_disable();
+			hard_irq_disable();
 			irqs_disabled = 1;
 			/* Ack: irqs disabled. */
 			smp_mb(); /* Must read state first. */
@@ -124,6 +127,7 @@ static int stop_machine(void)
 
 	/* Make them disable irqs. */
 	local_irq_disable();
+	hard_irq_disable();
 	stopmachine_set_state(STOPMACHINE_DISABLE_IRQ);
 
 	return 0;