| commit | 716a42348cdaf04534b15fbdc9c83e25baebfed5 | |
| author | Frederic Weisbecker <fweisbec@gmail.com> | |
| Fri, 24 Jul 2009 18:05:23 +0000 (24 20:05 +0200) | ||
| committer | Ingo Molnar <mingo@elte.hu> | |
| Sun, 2 Aug 2009 12:03:57 +0000 (2 14:03 +0200) | ||
| tree | 5a49fe4c0ff258ee03478994ffc7fbe8032a340f | treesnapshot (tar.gz zip) |
| parent | a004cd42181409eda70804ded240a791f4564d61 | commitdiff |
sched: Fix cond_resched_lock() in !CONFIG_PREEMPT
The might_sleep() test inside cond_resched_lock() assumes the
spinlock is held and then preemption is disabled. This is true
with CONFIG_PREEMPT but the preempt_count() doesn't change
otherwise.
Check by starting from the appropriate preempt offset depending
on the config.
Reported-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1248458723-12146-1-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
The might_sleep() test inside cond_resched_lock() assumes the
spinlock is held and then preemption is disabled. This is true
with CONFIG_PREEMPT but the preempt_count() doesn't change
otherwise.
Check by starting from the appropriate preempt offset depending
on the config.
Reported-by: Li Zefan <lizf@cn.fujitsu.com>
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <1248458723-12146-1-git-send-email-fweisbec@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
| include/linux/sched.h | diffblobblamehistory |