X-Git-Url: http://ftp.safe.ca/?a=blobdiff_plain;f=kernel%2Fstop_machine.c;h=9bb9fb1bd79c8b07da0dba482244d90e61aa7b76;hb=b5247c854ed1cef30e0c7f4c6dfbf3c9d83bcf8e;hp=0cd415ee62a262ccadea6b592a7402eb89fc4797;hpb=9ea09af3bd3090e8349ca2899ca2011bd94cda85;p=safe%2Fjmp%2Flinux-2.6

diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c
index 0cd415e..9bb9fb1 100644
--- a/kernel/stop_machine.c
+++ b/kernel/stop_machine.c
@@ -44,8 +44,8 @@ static DEFINE_MUTEX(setup_lock);
 static int refcount;
 static struct workqueue_struct *stop_machine_wq;
 static struct stop_machine_data active, idle;
-static const cpumask_t *active_cpus;
-static void *stop_machine_work;
+static const struct cpumask *active_cpus;
+static void __percpu *stop_machine_work;
 
 static void set_state(enum stopmachine_state newstate)
 {
@@ -170,7 +170,7 @@ int __stop_machine(int (*fn)(void *), void *data, const struct cpumask *cpus)
 	 * doesn't hit this CPU until we're ready. */
 	get_cpu();
 	for_each_online_cpu(i) {
-		sm_work = percpu_ptr(stop_machine_work, i);
+		sm_work = per_cpu_ptr(stop_machine_work, i);
 		INIT_WORK(sm_work, stop_cpu);
 		queue_work_on(i, stop_machine_wq, sm_work);
 	}