Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S266839AbUIWUho (ORCPT ); Thu, 23 Sep 2004 16:37:44 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S267304AbUIWUhc (ORCPT ); Thu, 23 Sep 2004 16:37:32 -0400 Received: from baikonur.stro.at ([213.239.196.228]:18152 "EHLO baikonur.stro.at") by vger.kernel.org with ESMTP id S266839AbUIWUZk (ORCPT ); Thu, 23 Sep 2004 16:25:40 -0400 Subject: [patch 17/26] char/riscom8: 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:41 +0200 Message-ID: Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1752 Lines: 53 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/riscom8.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff -puN drivers/char/riscom8.c~msleep_interruptible-drivers_char_riscom8 drivers/char/riscom8.c --- linux-2.6.9-rc2-bk7/drivers/char/riscom8.c~msleep_interruptible-drivers_char_riscom8 2004-09-21 21:08:17.000000000 +0200 +++ linux-2.6.9-rc2-bk7-max/drivers/char/riscom8.c 2004-09-21 21:08:17.000000000 +0200 @@ -45,6 +45,7 @@ #include #include #include +#include #include @@ -1114,8 +1115,7 @@ static void rc_close(struct tty_struct * */ timeout = jiffies+HZ; while(port->IER & IER_TXEMPTY) { - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(port->timeout); + msleep_interruptible(jiffies_to_msecs(port->timeout)); if (time_after(jiffies, timeout)) break; } @@ -1130,8 +1130,7 @@ static void rc_close(struct tty_struct * port->tty = NULL; if (port->blocked_open) { if (port->close_delay) { - current->state = TASK_INTERRUPTIBLE; - schedule_timeout(port->close_delay); + msleep_interruptible(jiffies_to_msecs(port->close_delay)); } wake_up_interruptible(&port->open_wait); } _ - 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/