diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 22:08:38 +0200 |
---|---|---|
committer | Clark Williams <williams@redhat.com> | 2012-04-04 09:14:49 -0500 |
commit | 6fd5becabcf9b8e1a47ea4e1e2fb4c7f97a3c8df (patch) | |
tree | 614f6d76040797a7d105af413a11949ab9a79381 /kernel/rtmutex.c | |
parent | c21071ccf7a30b829f95f6b227b6718910359dc9 (diff) |
timer-handle-idle-trylock-in-get-next-timer-irq.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'kernel/rtmutex.c')
-rw-r--r-- | kernel/rtmutex.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/kernel/rtmutex.c b/kernel/rtmutex.c index a7723d217170..9850dc02f1db 100644 --- a/kernel/rtmutex.c +++ b/kernel/rtmutex.c @@ -861,15 +861,10 @@ EXPORT_SYMBOL(rt_spin_unlock_wait); int __lockfunc rt_spin_trylock(spinlock_t *lock) { - int ret; + int ret = rt_mutex_trylock(&lock->lock); - migrate_disable(); - ret = rt_mutex_trylock(&lock->lock); if (ret) spin_acquire(&lock->dep_map, 0, 1, _RET_IP_); - else - migrate_enable(); - return ret; } EXPORT_SYMBOL(rt_spin_trylock); |