diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2016-06-23 12:11:17 -0700 |
|---|---|---|
| committer | Zubin Mithra <zsm@google.com> | 2018-01-05 10:59:58 +0000 |
| commit | d12f6c7523b56159f4bae90b1271676ed862e615 (patch) | |
| tree | f734724f3b4a13f4a250db94b1e93d14560fa549 /kernel/locking/mutex-debug.c | |
| parent | 7dec32e11cbec86f40de5b0b7032d83e2335a788 (diff) | |
UPSTREAM: locking: avoid passing around 'thread_info' in mutex debugging code
None of the code actually wants a thread_info, it all wants a
task_struct, and it's just converting back and forth between the two
("ti->task" to get the task_struct from the thread_info, and
"task_thread_info(task)" to go the other way).
No semantic change.
Acked-by: Peter Zijlstra <peterz@infradead.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Bug: 66351489
Change-Id: I34d679e7afd0e5f86675a766384320c4597a8f6a
(cherry picked from commit 6720a305df74ca30bcc10fc316881641b6ff0c80)
Signed-off-by: Zubin Mithra <zsm@google.com>
Diffstat (limited to 'kernel/locking/mutex-debug.c')
| -rw-r--r-- | kernel/locking/mutex-debug.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/locking/mutex-debug.c b/kernel/locking/mutex-debug.c index 5cf6731b98e..ce3bc5a8ee4 100644 --- a/kernel/locking/mutex-debug.c +++ b/kernel/locking/mutex-debug.c @@ -49,21 +49,21 @@ void debug_mutex_free_waiter(struct mutex_waiter *waiter) } void debug_mutex_add_waiter(struct mutex *lock, struct mutex_waiter *waiter, - struct thread_info *ti) + struct task_struct *task) { SMP_DEBUG_LOCKS_WARN_ON(!spin_is_locked(&lock->wait_lock)); /* Mark the current thread as blocked on the lock: */ - ti->task->blocked_on = waiter; + task->blocked_on = waiter; } void mutex_remove_waiter(struct mutex *lock, struct mutex_waiter *waiter, - struct thread_info *ti) + struct task_struct *task) { DEBUG_LOCKS_WARN_ON(list_empty(&waiter->list)); - DEBUG_LOCKS_WARN_ON(waiter->task != ti->task); - DEBUG_LOCKS_WARN_ON(ti->task->blocked_on != waiter); - ti->task->blocked_on = NULL; + DEBUG_LOCKS_WARN_ON(waiter->task != task); + DEBUG_LOCKS_WARN_ON(task->blocked_on != waiter); + task->blocked_on = NULL; list_del_init(&waiter->list); waiter->task = NULL; |