diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2011-07-17 20:08:38 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2015-02-13 22:20:46 (GMT) |
| commit | 0623bc2dddc5fef9659d652cede0af467e437473 (patch) | |
| tree | e351ea0d8d6229446d39e6cafceb4e51c1d8d387 /kernel/rtmutex.c | |
| parent | 1aa3f1a3a6b35843dc824e8aaad6420d476e5dcd (diff) | |
| download | linux-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 '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 f78bbcd..82d1708 100644 --- a/kernel/rtmutex.c +++ b/kernel/rtmutex.c @@ -1027,15 +1027,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); |