diff --git a/[refs] b/[refs] index dfaa625ffef7..84a710341795 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 493d35863dbb692c38c1415fd83d88dfb902ae37 +refs/heads/master: 6ad36762d7a88d747f6fed95194b4f7ff5da8df4 diff --git a/trunk/kernel/mutex.c b/trunk/kernel/mutex.c index d046a345d365..bcdc9ac8ef60 100644 --- a/trunk/kernel/mutex.c +++ b/trunk/kernel/mutex.c @@ -165,10 +165,7 @@ __mutex_lock_common(struct mutex *lock, long state, unsigned int subclass, * got a signal? (This code gets eliminated in the * TASK_UNINTERRUPTIBLE case.) */ - if (unlikely((state == TASK_INTERRUPTIBLE && - signal_pending(task)) || - (state == TASK_KILLABLE && - fatal_signal_pending(task)))) { + if (unlikely(signal_pending_state(state, task))) { mutex_remove_waiter(lock, &waiter, task_thread_info(task)); mutex_release(&lock->dep_map, 1, ip);