diff options
| author | Ingo Molnar <mingo@kernel.org> | 2015-02-04 09:44:00 +0300 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2015-02-04 09:44:00 +0300 |
| commit | 4c195c8a1967ff8bee13a811518a99db04618ab7 (patch) | |
| tree | 555682bd243ac56920ef7a2f3c1f3b666996c7b3 /include | |
| parent | 16b269436b7213ebc01dcfcc9dafa8535b676ccb (diff) | |
| parent | 40767b0dc768060266d261b4a330164b4be53f7c (diff) | |
| download | linux-4c195c8a1967ff8bee13a811518a99db04618ab7.tar.xz | |
Merge branch 'sched/urgent' into sched/core, to merge fixes before applying new patches
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/wait.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/wait.h b/include/linux/wait.h index 2232ed16635a..37423e0e1379 100644 --- a/include/linux/wait.h +++ b/include/linux/wait.h @@ -363,7 +363,6 @@ do { \ */ #define wait_event_cmd(wq, condition, cmd1, cmd2) \ do { \ - might_sleep(); \ if (condition) \ break; \ __wait_event_cmd(wq, condition, cmd1, cmd2); \ |