diff options
Diffstat (limited to 'kernel')
-rw-r--r-- | kernel/mutex.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/kernel/mutex.c b/kernel/mutex.c index d046a345d365..bcdc9ac8ef60 100644 --- a/kernel/mutex.c +++ b/kernel/mutex.c | |||
@@ -165,10 +165,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, | |||
165 | * got a signal? (This code gets eliminated in the | 165 | * got a signal? (This code gets eliminated in the |
166 | * TASK_UNINTERRUPTIBLE case.) | 166 | * TASK_UNINTERRUPTIBLE case.) |
167 | */ | 167 | */ |
168 | if (unlikely((state == TASK_INTERRUPTIBLE && | 168 | if (unlikely(signal_pending_state(state, task))) { |
169 | signal_pending(task)) || | ||
170 | (state == TASK_KILLABLE && | ||
171 | fatal_signal_pending(task)))) { | ||
172 | mutex_remove_waiter(lock, &waiter, | 169 | mutex_remove_waiter(lock, &waiter, |
173 | task_thread_info(task)); | 170 | task_thread_info(task)); |
174 | mutex_release(&lock->dep_map, 1, ip); | 171 | mutex_release(&lock->dep_map, 1, ip); |