From: Josh Triplett Date: Fri, 29 Sep 2006 09:01:00 +0000 (-0700) Subject: [PATCH] Replace _spin_trylock with spin_trylock in the IRQ variants to use __cond_lock X-Git-Tag: v2.6.19-rc1~712 X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=303912e2a32aa73785b4c4dee15466d944a38a46;p=linux-2.6 [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 Cc: Ingo Molnar Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds --- diff --git a/include/linux/spinlock.h b/include/linux/spinlock.h index 31473db92d..456e74f0e1 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; }); \ })