Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a12bb444 authored by Benjamin Herrenschmidt's avatar Benjamin Herrenschmidt Committed by Linus Torvalds
Browse files

stop_machine() now uses hard_irq_disable 



Add a call to hard_irq_disable() to stop_machine so that we make sure IRQs are
really disabled and not only lazy-disabled on archs like powerpc as some users
of stop_machine() may rely on that.

[akpm@linux-foundation.org: build fix]
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: default avatarRusty Russell <rusty@rustcorp.com.au>
Cc: Paul Mackerras <paulus@samba.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 2d3fbbb3

kernel/stop_machine.c

+4 −0
Original line number Diff line number Diff line
@@ -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;