Staging
v0.8.1
v0.8.1
https://github.com/torvalds/linux
Revision ba0084048ab785c2cb1d6cc2cccabe642a5b799a authored by Mark Fasheh on 22 December 2006, 09:06:15 UTC, committed by Linus Torvalds on 22 December 2006, 16:55:46 UTC
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>
1 parent 2aea4fb
Tip revision: ba0084048ab785c2cb1d6cc2cccabe642a5b799a authored by Mark Fasheh on 22 December 2006, 09:06:15 UTC
[PATCH] Conditionally check expected_preempt_count in __resched_legal()
[PATCH] Conditionally check expected_preempt_count in __resched_legal()
Tip revision: ba00840
| File | Mode | Size |
|---|---|---|
| Kconfig | -rw-r--r-- | 13.8 KB |
| Makefile | -rw-r--r-- | 1.5 KB |
| aes.c | -rw-r--r-- | 11.6 KB |
| algapi.c | -rw-r--r-- | 10.2 KB |
| anubis.c | -rw-r--r-- | 27.8 KB |
| api.c | -rw-r--r-- | 10.3 KB |
| arc4.c | -rw-r--r-- | 2.0 KB |
| blkcipher.c | -rw-r--r-- | 10.4 KB |
| blowfish.c | -rw-r--r-- | 17.4 KB |
| cast5.c | -rw-r--r-- | 34.1 KB |
| cast6.c | -rw-r--r-- | 21.5 KB |
| cbc.c | -rw-r--r-- | 8.6 KB |
| cipher.c | -rw-r--r-- | 13.6 KB |
| compress.c | -rw-r--r-- | 1.5 KB |
| crc32c.c | -rw-r--r-- | 2.6 KB |
| crypto_null.c | -rw-r--r-- | 3.3 KB |
| cryptomgr.c | -rw-r--r-- | 3.3 KB |
| deflate.c | -rw-r--r-- | 5.4 KB |
| des.c | -rw-r--r-- | 35.4 KB |
| digest.c | -rw-r--r-- | 3.5 KB |
| ecb.c | -rw-r--r-- | 4.8 KB |
| gf128mul.c | -rw-r--r-- | 12.9 KB |
| hash.c | -rw-r--r-- | 1.6 KB |
| hmac.c | -rw-r--r-- | 6.6 KB |
| internal.h | -rw-r--r-- | 4.6 KB |
| khazad.c | -rw-r--r-- | 51.8 KB |
| lrw.c | -rw-r--r-- | 7.5 KB |
| md4.c | -rw-r--r-- | 6.2 KB |
| md5.c | -rw-r--r-- | 7.2 KB |
| michael_mic.c | -rw-r--r-- | 3.5 KB |
| proc.c | -rw-r--r-- | 3.0 KB |
| scatterwalk.c | -rw-r--r-- | 2.4 KB |
| scatterwalk.h | -rw-r--r-- | 2.2 KB |
| serpent.c | -rw-r--r-- | 19.7 KB |
| sha1.c | -rw-r--r-- | 3.2 KB |
| sha256.c | -rw-r--r-- | 11.1 KB |
| sha512.c | -rw-r--r-- | 10.3 KB |
| tcrypt.c | -rw-r--r-- | 33.3 KB |
| tcrypt.h | -rw-r--r-- | 138.4 KB |
| tea.c | -rw-r--r-- | 7.1 KB |
| tgr192.c | -rw-r--r-- | 31.1 KB |
| twofish.c | -rw-r--r-- | 6.2 KB |
| twofish_common.c | -rw-r--r-- | 39.6 KB |
| wp512.c | -rw-r--r-- | 60.3 KB |
| xcbc.c | -rw-r--r-- | 8.8 KB |
Computing file changes ...
