It's called stopmachine_mutex now, but it's a semaphore. So make it a "struct mutex" . Signed-off-by: Daniel Walker --- kernel/stop_machine.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: linux-2.6.23/kernel/stop_machine.c =================================================================== --- linux-2.6.23.orig/kernel/stop_machine.c +++ linux-2.6.23/kernel/stop_machine.c @@ -29,7 +29,7 @@ enum stopmachine_state { static enum stopmachine_state stopmachine_state; static unsigned int stopmachine_num_threads; static atomic_t stopmachine_thread_ack; -static DECLARE_MUTEX(stopmachine_mutex); +static DEFINE_MUTEX(stopmachine_mutex); static int stopmachine(void *cpu) { @@ -177,7 +177,7 @@ struct task_struct *__stop_machine_run(i smdata.data = data; init_completion(&smdata.done); - down(&stopmachine_mutex); + mutex_lock(&stopmachine_mutex); /* If they don't care which CPU fn runs on, bind to any online one. */ if (cpu == NR_CPUS) @@ -193,7 +193,7 @@ struct task_struct *__stop_machine_run(i wake_up_process(p); wait_for_completion(&smdata.done); } - up(&stopmachine_mutex); + mutex_unlock(&stopmachine_mutex); return p; } --