diff options
| author | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:20:55 -0400 |
|---|---|---|
| committer | Jeff Garzik <jeff@garzik.org> | 2006-08-29 17:20:55 -0400 |
| commit | a422142cfdf90d889d8d3e2affb8311a381530b7 (patch) | |
| tree | bde7e2c7a3ee8bca649aecd877a9ee1593f4223e /kernel/stop_machine.c | |
| parent | 6fc47e31c0e802d205d67e644f654532e5d365d5 (diff) | |
| parent | 60d4684068ff1eec78f55b5888d0bd2d4cca1520 (diff) | |
Merge branch 'master' into upstream
Diffstat (limited to 'kernel/stop_machine.c')
| -rw-r--r-- | kernel/stop_machine.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c index dcfb5d731466..51cacd111dbd 100644 --- a/kernel/stop_machine.c +++ b/kernel/stop_machine.c | |||
| @@ -111,7 +111,6 @@ static int stop_machine(void) | |||
| 111 | /* If some failed, kill them all. */ | 111 | /* If some failed, kill them all. */ |
| 112 | if (ret < 0) { | 112 | if (ret < 0) { |
| 113 | stopmachine_set_state(STOPMACHINE_EXIT); | 113 | stopmachine_set_state(STOPMACHINE_EXIT); |
| 114 | up(&stopmachine_mutex); | ||
| 115 | return ret; | 114 | return ret; |
| 116 | } | 115 | } |
| 117 | 116 | ||