44 lines
1.5 KiB
Diff
44 lines
1.5 KiB
Diff
Subject: [PATCH] Wrap access to thread_info
|
|
|
|
From: Roman Zippel <zippel@linux-m68k.org>
|
|
|
|
Wrap direct thread_info access
|
|
|
|
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
|
|
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
|
|
---
|
|
kernel/mutex.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
--- linux-m68k-2.6.21.orig/kernel/mutex.c
|
|
+++ linux-m68k-2.6.21/kernel/mutex.c
|
|
@@ -133,7 +133,7 @@ __mutex_lock_common(struct mutex *lock,
|
|
|
|
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,
|
|
*/
|
|
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,
|
|
}
|
|
|
|
/* 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)))
|