timer-handle-idle-trylock-in-get-next-timer-irq.patch
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
parent
d4001bfc52
commit
8c09ef3177
|
@ -50,7 +50,17 @@ extern void __lockfunc __rt_spin_unlock(struct rt_mutex *lock);
|
||||||
|
|
||||||
#define spin_lock_irq(lock) spin_lock(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
|
#ifdef CONFIG_LOCKDEP
|
||||||
# define spin_lock_nested(lock, subclass) \
|
# define spin_lock_nested(lock, subclass) \
|
||||||
|
|
|
@ -1119,15 +1119,10 @@ EXPORT_SYMBOL(rt_spin_unlock_wait);
|
||||||
|
|
||||||
int __lockfunc rt_spin_trylock(spinlock_t *lock)
|
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)
|
if (ret)
|
||||||
spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
|
spin_acquire(&lock->dep_map, 0, 1, _RET_IP_);
|
||||||
else
|
|
||||||
migrate_enable();
|
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
EXPORT_SYMBOL(rt_spin_trylock);
|
EXPORT_SYMBOL(rt_spin_trylock);
|
||||||
|
|
|
@ -1386,9 +1386,10 @@ unsigned long get_next_timer_interrupt(unsigned long now)
|
||||||
/*
|
/*
|
||||||
* On PREEMPT_RT we cannot sleep here. If the trylock does not
|
* On PREEMPT_RT we cannot sleep here. If the trylock does not
|
||||||
* succeed then we return the worst-case 'expires in 1 tick'
|
* succeed then we return the worst-case 'expires in 1 tick'
|
||||||
* value:
|
* value. We use the rt functions here directly to avoid a
|
||||||
|
* migrate_disable() call.
|
||||||
*/
|
*/
|
||||||
if (!spin_trylock(&base->lock))
|
if (!spin_do_trylock(&base->lock))
|
||||||
return now + 1;
|
return now + 1;
|
||||||
#else
|
#else
|
||||||
spin_lock(&base->lock);
|
spin_lock(&base->lock);
|
||||||
|
@ -1398,7 +1399,11 @@ unsigned long get_next_timer_interrupt(unsigned long now)
|
||||||
base->next_timer = __next_timer_interrupt(base);
|
base->next_timer = __next_timer_interrupt(base);
|
||||||
expires = base->next_timer;
|
expires = base->next_timer;
|
||||||
}
|
}
|
||||||
|
#ifdef CONFIG_PREEMPT_RT_FULL
|
||||||
|
rt_spin_unlock(&base->lock);
|
||||||
|
#else
|
||||||
spin_unlock(&base->lock);
|
spin_unlock(&base->lock);
|
||||||
|
#endif
|
||||||
|
|
||||||
if (time_before_eq(expires, now))
|
if (time_before_eq(expires, now))
|
||||||
return now;
|
return now;
|
||||||
|
|
Loading…
Reference in New Issue