projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6
[firefly-linux-kernel-4.4.55.git]
/
kernel
/
rtmutex.c
diff --git
a/kernel/rtmutex.c
b/kernel/rtmutex.c
index 8cd9bd2cdb34243a89c45102708abdcc2c7cbdbd..6522ae5b14a2ad7aca5cde919c3a5f1d305c6fd6 100644
(file)
--- a/
kernel/rtmutex.c
+++ b/
kernel/rtmutex.c
@@
-185,7
+185,7
@@
static int rt_mutex_adjust_prio_chain(struct task_struct *task,
prev_max = max_lock_depth;
printk(KERN_WARNING "Maximum lock depth %d reached "
"task: %s (%d)\n", max_lock_depth,
prev_max = max_lock_depth;
printk(KERN_WARNING "Maximum lock depth %d reached "
"task: %s (%d)\n", max_lock_depth,
- top_task->comm, t
op_task->pid
);
+ top_task->comm, t
ask_pid_nr(top_task)
);
}
put_task_struct(task);
}
put_task_struct(task);
@@
-630,9
+630,12
@@
rt_mutex_slowlock(struct rt_mutex *lock, int state,
set_current_state(state);
/* Setup the timer, when timeout != NULL */
set_current_state(state);
/* Setup the timer, when timeout != NULL */
- if (unlikely(timeout))
+ if (unlikely(timeout))
{
hrtimer_start(&timeout->timer, timeout->timer.expires,
HRTIMER_MODE_ABS);
hrtimer_start(&timeout->timer, timeout->timer.expires,
HRTIMER_MODE_ABS);
+ if (!hrtimer_active(&timeout->timer))
+ timeout->task = NULL;
+ }
for (;;) {
/* Try to acquire the lock: */
for (;;) {
/* Try to acquire the lock: */