Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754082AbYGXQcL (ORCPT ); Thu, 24 Jul 2008 12:32:11 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752007AbYGXQbn (ORCPT ); Thu, 24 Jul 2008 12:31:43 -0400 Received: from x346.tv-sign.ru ([89.108.83.215]:34767 "EHLO mail.screens.ru" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751835AbYGXQbm (ORCPT ); Thu, 24 Jul 2008 12:31:42 -0400 Date: Thu, 24 Jul 2008 20:34:59 +0400 From: Oleg Nesterov To: Andrew Morton Cc: Ingo Molnar , Matthew Wilcox , Roland McGrath , linux-kernel@vger.kernel.org Subject: [PATCH] do_wait_for_common: use signal_pending_state() Message-ID: <20080724163459.GA3151@tv-sign.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.11 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 917 Lines: 25 Change do_wait_for_common() to use signal_pending_state() instead of open coding. Signed-off-by: Oleg Nesterov --- 26-rc2/kernel/sched.c~1_SPS_WAIT_FOR 2008-07-22 18:36:58.000000000 +0400 +++ 26-rc2/kernel/sched.c 2008-07-24 19:54:12.000000000 +0400 @@ -4735,10 +4735,7 @@ do_wait_for_common(struct completion *x, wait.flags |= WQ_FLAG_EXCLUSIVE; __add_wait_queue_tail(&x->wait, &wait); do { - if ((state == TASK_INTERRUPTIBLE && - signal_pending(current)) || - (state == TASK_KILLABLE && - fatal_signal_pending(current))) { + if (signal_pending_state(state, current)) { timeout = -ERESTARTSYS; break; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/