diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 22:08:38 +0200 |
|---|---|---|
| committer | Clark Williams <williams@redhat.com> | 2012-03-13 12:40:12 -0500 |
| commit | e63dbbb5631552a99acbe5807aa7835a88c2b9ee (patch) | |
| tree | 769226e71c2024920300155ba2bcb4d2d37fd00c /include | |
| parent | 06b59470a2bdb09f5474d6e4ebf57d26e48fd614 (diff) | |
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.h | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/include/linux/spinlock_rt.h b/include/linux/spinlock_rt.h index 205ca95a849e..3b555b4b52cf 100644 --- a/include/linux/spinlock_rt.h +++ b/include/linux/spinlock_rt.h @@ -51,7 +51,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) \ |