---

yaml --- r: 119070 b: refs/heads/master c: e14c8bf h: refs/heads/master v: v3
git-mirror · Nov 16, 2008 · 1923673 · 1923673
1 parent 3e866e4
commit 1923673
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c06fe772da43db63b053addcd2c267f76d0be91
+refs/heads/master: e14c8bf86350f6c39186a139c5c584a6111b2f01
diff --git a/trunk/kernel/stop_machine.c b/trunk/kernel/stop_machine.c
@@ -112,7 +112,7 @@ static int chill(void *unused)
 int __stop_machine(int (*fn)(void *), void *data, const cpumask_t *cpus)
 {
 	struct work_struct *sm_work;
-	int i;
+	int i, ret;
 
 	/* Set up initial state. */
 	mutex_lock(&lock);
@@ -137,8 +137,9 @@ int __stop_machine(int (*fn)(void *), void *data, const cpumask_t *cpus)
 	/* This will release the thread on our CPU. */
 	put_cpu();
 	flush_workqueue(stop_machine_wq);
+	ret = active.fnret;
 	mutex_unlock(&lock);
-	return active.fnret;
+	return ret;
 }
 
 int stop_machine(int (*fn)(void *), void *data, const cpumask_t *cpus)