tree e98f5cda14643fd705b69e318ad86f854edbb18b
parent 9f50b93f066f8dc339de9b0eb78a22a75e6c8f8f
author Josh Triplett <josht@us.ibm.com> 1159520460 -0700
committer Linus Torvalds <torvalds@g5.osdl.org> 1159546699 -0700

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