From 19236731eca01ca114bf36cd905511f5ca68ea23 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Mon, 17 Nov 2008 08:22:18 +1030 Subject: [PATCH] --- yaml --- r: 119070 b: refs/heads/master c: e14c8bf86350f6c39186a139c5c584a6111b2f01 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/kernel/stop_machine.c | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 3cf77d73a943..bc9aa98180fb 100644 --- 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 index 9bc4c00872c9..24e8ceacc388 100644 --- 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)