Commit 6ad36762d7a88d747f6fed95194b4f7ff5da8df4

Authored by Oleg Nesterov
Committed by Ingo Molnar
1 parent 493d35863d

__mutex_lock_common: use signal_pending_state()

Change __mutex_lock_common() to use signal_pending_state() for the sake of
the code re-use.

This adds 7 bytes to kernel/mutex.o, but afaics only because gcc isn't smart
enough.

(btw, uninlining of __mutex_lock_common() shrinks .text from 2722 to 1542,
 perhaps it is worth doing).

Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Ingo Molnar <mingo@elte.hu>

Showing 1 changed file with 1 additions and 4 deletions Side-by-side Diff

... ... @@ -165,10 +165,7 @@
165 165 * got a signal? (This code gets eliminated in the
166 166 * TASK_UNINTERRUPTIBLE case.)
167 167 */
168   - if (unlikely((state == TASK_INTERRUPTIBLE &&
169   - signal_pending(task)) ||
170   - (state == TASK_KILLABLE &&
171   - fatal_signal_pending(task)))) {
  168 + if (unlikely(signal_pending_state(state, task))) {
172 169 mutex_remove_waiter(lock, &waiter,
173 170 task_thread_info(task));
174 171 mutex_release(&lock->dep_map, 1, ip);