diff options
| author | Ingo Molnar <mingo@kernel.org> | 2013-08-16 17:40:23 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2013-08-16 17:40:23 +0200 |
| commit | d3ec3a1fd08f705d1b319db4113590944bcde749 (patch) | |
| tree | 598a0da59e027b455f11beab24a96ef1e56fbbcb /kernel/wait.c | |
| parent | 8f898fbbe5ee5e20a77c4074472a1fd088dc47d1 (diff) | |
| parent | d4e4ab86bcba5a72779c43dc1459f71fea3d89c8 (diff) | |
Merge tag 'v3.11-rc5' into sched/core
Merge Linux 3.11-rc5, to pick up the latest fixes.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'kernel/wait.c')
| -rw-r--r-- | kernel/wait.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/wait.c b/kernel/wait.c index ce0daa320a26..dec68bd4e9d8 100644 --- a/kernel/wait.c +++ b/kernel/wait.c @@ -333,7 +333,8 @@ int __wait_on_atomic_t(wait_queue_head_t *wq, struct wait_bit_queue *q, prepare_to_wait(wq, &q->wait, mode); val = q->key.flags; if (atomic_read(val) == 0) - ret = (*action)(val); + break; + ret = (*action)(val); } while (!ret && atomic_read(val) != 0); finish_wait(wq, &q->wait); return ret; |