wrap access to thread_info

Recently a few direct accesses to the thread_info in the task structure snuck
back, so this wraps them with the appropriate wrapper.

Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

1 files changed, 4 insertions, 4 deletions

diff --git a/kernel/mutex.c b/kernel/mutex.c
index e7cbbb82765b..303eab18484b 100644
--- a/kernel/mutex.c
+++ b/kernel/mutex.c
@@ -133,7 +133,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass)
 
         debug_mutex_lock_common(lock, &waiter);
         mutex_acquire(&lock->dep_map, subclass, 0, _RET_IP_);
-        debug_mutex_add_waiter(lock, &waiter, task->thread_info);
+        debug_mutex_add_waiter(lock, &waiter, task_thread_info(task));
 
         /* add waiting tasks to the end of the waitqueue (FIFO): */
         list_add_tail(&waiter.list, &lock->wait_list);
@@ -159,7 +159,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass)
                  */
                 if (unlikely(state == TASK_INTERRUPTIBLE &&
                                                 signal_pending(task))) {
-                        mutex_remove_waiter(lock, &waiter, task->thread_info);
+                        mutex_remove_waiter(lock, &waiter, task_thread_info(task));
                         mutex_release(&lock->dep_map, 1, _RET_IP_);
                         spin_unlock_mutex(&lock->wait_lock, flags);
 
@@ -175,8 +175,8 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass)
         }
 
         /* got the lock - rejoice! */
-        mutex_remove_waiter(lock, &waiter, task->thread_info);
-        debug_mutex_set_owner(lock, task->thread_info);
+        mutex_remove_waiter(lock, &waiter, task_thread_info(task));
+        debug_mutex_set_owner(lock, task_thread_info(task));
 
         /* set it to 0 if there are no waiters left: */
         if (likely(list_empty(&lock->wait_list)))