projects
/
powerpc.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
NFS: Kill the obsolete NFS_PARANOIA
[powerpc.git]
/
kernel
/
mutex.c
diff --git
a/kernel/mutex.c
b/kernel/mutex.c
index
8c71cf7
..
303eab1
100644
(file)
--- 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_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);
/* 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))) {
*/
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);
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! */
}
/* 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)))
/* set it to 0 if there are no waiters left: */
if (likely(list_empty(&lock->wait_list)))
@@
-206,6
+206,15
@@
mutex_lock_nested(struct mutex *lock, unsigned int subclass)
}
EXPORT_SYMBOL_GPL(mutex_lock_nested);
}
EXPORT_SYMBOL_GPL(mutex_lock_nested);
+
+int __sched
+mutex_lock_interruptible_nested(struct mutex *lock, unsigned int subclass)
+{
+ might_sleep();
+ return __mutex_lock_common(lock, TASK_INTERRUPTIBLE, subclass);
+}
+
+EXPORT_SYMBOL_GPL(mutex_lock_interruptible_nested);
#endif
/*
#endif
/*