Merge git://git.kernel.org/pub/scm/linux/kernel/git/joern/logfs

[~andy/linux] / kernel / stop_machine.c

diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index 912823e2a11b0afb0f4448e5163bb9e39c7fc8b8..9bb9fb1bd79c8b07da0dba482244d90e61aa7b76 100644 (file)
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -45,7 +45,7 @@ static int refcount;
 static struct workqueue_struct *stop_machine_wq;
 static struct stop_machine_data active, idle;
 static const struct cpumask *active_cpus;
-static void *stop_machine_work;
+static void __percpu *stop_machine_work;
 
 static void set_state(enum stopmachine_state newstate)
 {