Commit 6ad36762 authored Jun 08, 2008 by Oleg Nesterov Committed by Ingo Molnar Jun 10, 2008

__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>

parent 493d3586

kernel/mutex.c

+1 −4

Original line number	Diff line number	Diff line
		@@ -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);