Skip to contentSkip to conversation

__mutex_lock_common: use signal_pending_state()

PATCH In review Oleg Nesterov 1 participant 1 message Jun 8, 2008

lore
Share & tools
lore
#0 lore raw

PATCH 2/3 __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).

kernel/mutex.c renamed from kernel/mutex.c~2_MUTEX_USE_HELPER +1 -4
@@ -165,10 +165,7 @@ __mutex_lock_common(struct mutex *lock, 
 		 * 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);