path: root/mm
diff options
authorMark Fasheh <mark.fasheh@oracle.com>2006-12-22 01:06:15 -0800
committerLinus Torvalds <torvalds@woody.osdl.org>2006-12-22 08:55:46 -0800
commitba0084048ab785c2cb1d6cc2cccabe642a5b799a (patch)
tree402f1d6a726413a734ab05415a8f3277d23310e7 /mm
parent[PATCH] CONFIG_VM_EVENT_COUNTER comment decrustify (diff)
[PATCH] Conditionally check expected_preempt_count in __resched_legal()
Commit 2d7d253548cffdce80f4e03664686e9ccb1b0ed7 ("fix cond_resched() fix") introduced an 'expected_preempt_count' parameter to __resched_legal() to fix a bug where it was returning a false negative when called from cond_resched_lock() and preemption was enabled. Unfortunately this broke things for when preemption is disabled. preempt_count() will always return zero, thus failing the check against any value of expected_preempt_count not equal to zero. cond_resched_lock() for example, passes an expected_preempt_count value of 1. So fix the fix for the cond_resched() fix by skipping the check of preempt_count() against expected_preempt_count when preemption is disabled. Credit should go to Sunil Mushran for spotting the bug during testing. Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com> Acked-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'mm')
0 files changed, 0 insertions, 0 deletions