Commit a61592f8 authored by Rohit Gupta's avatar Rohit Gupta
parent 69dc4c70
Pipeline #24 skipped
......@@ -109,10 +109,10 @@ extern void __rt_mutex_init(struct rt_mutex *lock, const char *name);
extern void rt_mutex_destroy(struct rt_mutex *lock);
extern void rt_mutex_lock(struct rt_mutex *lock);
extern int rt_mutex_lock_interruptible(struct rt_mutex *lock);
extern int rt_mutex_lock_killable(struct rt_mutex *lock);
extern int rt_mutex_lock_interruptible(struct rt_mutex *lock,int detect_deadlock);
extern int rt_mutex_lock_killable(struct rt_mutex *lock, int detect_deadlock);
extern int rt_mutex_timed_lock(struct rt_mutex *lock,
struct hrtimer_sleeper *timeout);
struct hrtimer_sleeper *timeout, int detect_deadlock);
extern int rt_mutex_trylock(struct rt_mutex *lock);
......
......@@ -1538,7 +1538,7 @@ retry_private:
this->pi_state = pi_state;
ret = rt_mutex_start_proxy_lock(&pi_state->pi_mutex,
this->rt_waiter,
this->task);
this->task, 1);
if (ret == 1) {
/* We got the lock. */
requeue_pi_wake_futex(this, &key2, hb2);
......@@ -2156,9 +2156,9 @@ retry_private:
/*
* Block on the PI mutex:
*/
if (!trylock) {
ret = rt_mutex_timed_futex_lock(&q.pi_state->pi_mutex, to);
} else {
if (!trylock)
ret = rt_mutex_timed_lock(&q.pi_state->pi_mutex, to, 1);
else {
ret = rt_mutex_trylock(&q.pi_state->pi_mutex);
/* Fixup the trylock return value: */
ret = ret ? 0 : -EWOULDBLOCK;
......@@ -2511,7 +2511,7 @@ static int futex_wait_requeue_pi(u32 __user *uaddr, unsigned int flags,
*/
WARN_ON(!q.pi_state);
pi_mutex = &q.pi_state->pi_mutex;
ret = rt_mutex_finish_proxy_lock(pi_mutex, to, &rt_waiter);
ret = rt_mutex_finish_proxy_lock(pi_mutex, to, &rt_waiter, 1);
debug_rt_mutex_free_waiter(&rt_waiter);
spin_lock(&hb2->lock);
......
......@@ -98,7 +98,7 @@ int __lockfunc _mutex_lock_interruptible(struct mutex *lock)
int ret;
mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
ret = rt_mutex_lock_interruptible(&lock->lock);
ret = rt_mutex_lock_interruptible(&lock->lock, 0);
if (ret)
mutex_release(&lock->dep_map, 1, _RET_IP_);
return ret;
......@@ -110,7 +110,7 @@ int __lockfunc _mutex_lock_killable(struct mutex *lock)
int ret;
mutex_acquire(&lock->dep_map, 0, 0, _RET_IP_);
ret = rt_mutex_lock_killable(&lock->lock);
ret = rt_mutex_lock_killable(&lock->lock, 0);
if (ret)
mutex_release(&lock->dep_map, 1, _RET_IP_);
return ret;
......@@ -137,7 +137,7 @@ int __lockfunc _mutex_lock_interruptible_nested(struct mutex *lock, int subclass
int ret;
mutex_acquire_nest(&lock->dep_map, subclass, 0, NULL, _RET_IP_);
ret = rt_mutex_lock_interruptible(&lock->lock);
ret = rt_mutex_lock_interruptible(&lock->lock, 0);
if (ret)
mutex_release(&lock->dep_map, 1, _RET_IP_);
return ret;
......@@ -149,7 +149,7 @@ int __lockfunc _mutex_lock_killable_nested(struct mutex *lock, int subclass)
int ret;
mutex_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
ret = rt_mutex_lock_killable(&lock->lock);
ret = rt_mutex_lock_killable(&lock->lock, 0);
if (ret)
mutex_release(&lock->dep_map, 1, _RET_IP_);
return ret;
......
This diff is collapsed.
......@@ -129,10 +129,10 @@ extern void rt_mutex_proxy_unlock(struct rt_mutex *lock,
struct task_struct *proxy_owner);
extern int rt_mutex_start_proxy_lock(struct rt_mutex *lock,
struct rt_mutex_waiter *waiter,
struct task_struct *task);
struct task_struct *task, int detect_deadlock);
extern int rt_mutex_finish_proxy_lock(struct rt_mutex *lock,
struct hrtimer_sleeper *to,
struct rt_mutex_waiter *waiter);
struct rt_mutex_waiter *waiter, int detect_deadlock);
extern int rt_mutex_timed_futex_lock(struct rt_mutex *l, struct hrtimer_sleeper *to);
#ifdef CONFIG_DEBUG_RT_MUTEXES
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment