diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-06 13:34:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-02-06 13:34:26 -0800 |
| commit | 396e9099ea5b4bc442995c807a779025d06663e8 (patch) | |
| tree | 6fe77a91b60abcf0cc5f7153a068f2e0ea60d1a0 /include | |
| parent | 29f12c48df4e6cba9df39dbe9d99649be27fb346 (diff) | |
| parent | 40767b0dc768060266d261b4a330164b4be53f7c (diff) | |
| download | linux-396e9099ea5b4bc442995c807a779025d06663e8.tar.bz2 | |
Merge branch 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull scheduler fixes from Ingo Molnar:
"Misc fixes"
* 'sched-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
sched/deadline: Fix deadline parameter modification handling
sched/wait: Remove might_sleep() from wait_event_cmd()
sched: Fix crash if cpuset_cpumask_can_shrink() is passed an empty cpumask
sched/fair: Avoid using uninitialized variable in preferred_group_nid()
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); \ |