Commit 303912e2 authored Sep 29, 2006 by Josh Triplett Committed by Linus Torvalds Sep 29, 2006

[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>

parent 9f50b93f

include/linux/spinlock.h

+2 −2

Original line number	Diff line number	Diff line
		@@ -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; }); \
		})