From a5396a8206a6fb9c4e0b9f658875cc53b532f710 Mon Sep 17 00:00:00 2001 From: Daniel Walker Date: Wed, 6 Feb 2008 01:37:41 -0800 Subject: [PATCH] --- yaml --- r: 83461 b: refs/heads/master c: 6c6080f74c8d83a83a1e36bce803de15c0633898 h: refs/heads/master i: 83459: 990e2ae7defa69749b5bc97927325bbf77cc0189 v: v3 --- [refs] | 2 +- trunk/kernel/stop_machine.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 071bb82d9ed7..4bad7a45f51f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: bcf11cbeccd7d981d68567942ba6ec184890bc29 +refs/heads/master: 6c6080f74c8d83a83a1e36bce803de15c0633898 diff --git a/trunk/kernel/stop_machine.c b/trunk/kernel/stop_machine.c index 51b5ee53571a..6f4e0e13f70c 100644 --- a/trunk/kernel/stop_machine.c +++ b/trunk/kernel/stop_machine.c @@ -29,7 +29,6 @@ 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 int stopmachine(void *cpu) { @@ -170,6 +169,7 @@ static int do_stop(void *_smdata) struct task_struct *__stop_machine_run(int (*fn)(void *), void *data, unsigned int cpu) { + static DEFINE_MUTEX(stopmachine_mutex); struct stop_machine_data smdata; struct task_struct *p; @@ -177,7 +177,7 @@ struct task_struct *__stop_machine_run(int (*fn)(void *), void *data, 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(int (*fn)(void *), void *data, wake_up_process(p); wait_for_completion(&smdata.done); } - up(&stopmachine_mutex); + mutex_unlock(&stopmachine_mutex); return p; }