summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2011-07-17 20:08:38 (GMT)
committerScott Wood <scottwood@freescale.com>2015-02-13 22:20:46 (GMT)
commit0623bc2dddc5fef9659d652cede0af467e437473 (patch)
treee351ea0d8d6229446d39e6cafceb4e51c1d8d387 /include
parent1aa3f1a3a6b35843dc824e8aaad6420d476e5dcd (diff)
downloadlinux-fsl-qoriq-0623bc2dddc5fef9659d652cede0af467e437473.tar.xz
timer-handle-idle-trylock-in-get-next-timer-irq.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r--include/linux/spinlock_rt.h12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/spinlock_rt.h b/include/linux/spinlock_rt.h
index 621d857..447c457 100644
--- a/include/linux/spinlock_rt.h
+++ b/include/linux/spinlock_rt.h
@@ -50,7 +50,17 @@ extern void __lockfunc __rt_spin_unlock(struct rt_mutex *lock);
#define spin_lock_irq(lock) spin_lock(lock)
-#define spin_trylock(lock) __cond_lock(lock, rt_spin_trylock(lock))
+#define spin_do_trylock(lock) __cond_lock(lock, rt_spin_trylock(lock))
+
+#define spin_trylock(lock) \
+({ \
+ int __locked; \
+ migrate_disable(); \
+ __locked = spin_do_trylock(lock); \
+ if (!__locked) \
+ migrate_enable(); \
+ __locked; \
+})
#ifdef CONFIG_LOCKDEP
# define spin_lock_nested(lock, subclass) \