diff options
| author | Josh Triplett <josht@us.ibm.com> | 2006-09-29 02:01:00 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 09:18:19 -0700 |
| commit | 303912e2a32aa73785b4c4dee15466d944a38a46 (patch) | |
| tree | e98f5cda14643fd705b69e318ad86f854edbb18b /include | |
| parent | 9f50b93f066f8dc339de9b0eb78a22a75e6c8f8f (diff) | |
| download | op-kernel-dev-303912e2a32aa73785b4c4dee15466d944a38a46.zip op-kernel-dev-303912e2a32aa73785b4c4dee15466d944a38a46.tar.gz | |
[PATCH] Replace _spin_trylock with spin_trylock in the IRQ variants to use __cond_lock
spin_trylock_irq and spin_trylock_irqsave use _spin_trylock, which does not
use the __cond_lock wrapper annotation and thus does not affect the lock
context; change them to use spin_trylock instead, which does use
__cond_lock.
Signed-off-by: Josh Triplett <josh@freedesktop.org>
Cc: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/spinlock.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index 31473db..456e74f 100644 --- a/include/linux/spinlock.h +++ b/include/linux/spinlock.h @@ -241,14 +241,14 @@ do { \ #define spin_trylock_irq(lock) \ ({ \ local_irq_disable(); \ - _spin_trylock(lock) ? \ + spin_trylock(lock) ? \ 1 : ({ local_irq_enable(); 0; }); \ }) #define spin_trylock_irqsave(lock, flags) \ ({ \ local_irq_save(flags); \ - _spin_trylock(lock) ? \ + spin_trylock(lock) ? \ 1 : ({ local_irq_restore(flags); 0; }); \ }) |
