diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 20:08:38 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:38:28 (GMT) |
| commit | d6b8f4a6bb6eedaa4a30fd55acd147a246add9f0 (patch) | |
| tree | de35a2324a195367cb09d46192a1e4636e4f5e65 /kernel/rtmutex.c | |
| parent | 13e88d8d6ebf00afd80988c323c3892021767e25 (diff) | |
| download | linux-fsl-qoriq-d6b8f4a6bb6eedaa4a30fd55acd147a246add9f0.tar.xz | |
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 d3d0c72..5aa004d 100644 --- a/kernel/rtmutex.c +++ b/kernel/rtmutex.c @@ -888,15 +888,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); |