Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S266808AbUIWUhq (ORCPT ); Thu, 23 Sep 2004 16:37:46 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S266854AbUIWUg5 (ORCPT ); Thu, 23 Sep 2004 16:36:57 -0400 Received: from baikonur.stro.at ([213.239.196.228]:12498 "EHLO baikonur.stro.at") by vger.kernel.org with ESMTP id S266837AbUIWUZn (ORCPT ); Thu, 23 Sep 2004 16:25:43 -0400 Subject: [patch 18/26] char/rocket: replace schedule_timeout() with msleep_interruptible() To: akpm@digeo.com Cc: linux-kernel@vger.kernel.org, janitor@sternwelten.at, nacc@us.ibm.com From: janitor@sternwelten.at Date: Thu, 23 Sep 2004 22:25:44 +0200 Message-ID: Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1626 Lines: 45 Any comments would be appreciated. Description: Use msleep_interruptible() instead of schedule_timeout() to guarantee the task delays as expected. Signed-off-by: Nishanth Aravamudan Signed-off-by: Maximilian Attems --- linux-2.6.9-rc2-bk7-max/drivers/char/rocket.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff -puN drivers/char/rocket.c~msleep_interruptible-drivers_char_rocket drivers/char/rocket.c --- linux-2.6.9-rc2-bk7/drivers/char/rocket.c~msleep_interruptible-drivers_char_rocket 2004-09-21 21:08:18.000000000 +0200 +++ linux-2.6.9-rc2-bk7-max/drivers/char/rocket.c 2004-09-21 21:08:18.000000000 +0200 @@ -1108,8 +1108,7 @@ static void rp_close(struct tty_struct * if (info->blocked_open) { if (info->close_delay) { - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(info->close_delay); + msleep_interruptible(jiffies_to_msecs(info->close_delay)); } wake_up_interruptible(&info->open_wait); } else { @@ -1534,8 +1533,7 @@ static void rp_wait_until_sent(struct tt #ifdef ROCKET_DEBUG_WAIT_UNTIL_SENT printk(KERN_INFO "txcnt = %d (jiff=%lu,check=%d)...", txcnt, jiffies, check_time); #endif - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(check_time); + msleep_interruptible(jiffies_to_msecs(check_time)); if (signal_pending(current)) 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/