Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S266705AbUIXCKA (ORCPT ); Thu, 23 Sep 2004 22:10:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S266689AbUIWUlN (ORCPT ); Thu, 23 Sep 2004 16:41:13 -0400 Received: from baikonur.stro.at ([213.239.196.228]:63467 "EHLO baikonur.stro.at") by vger.kernel.org with ESMTP id S266566AbUIWUZJ (ORCPT ); Thu, 23 Sep 2004 16:25:09 -0400 Subject: [patch 05/26] char/esp: 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:07 +0200 Message-ID: Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1740 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/esp.c | 7 +++---- 1 files changed, 3 insertions(+), 4 deletions(-) diff -puN drivers/char/esp.c~msleep_interruptible-drivers_char_esp drivers/char/esp.c --- linux-2.6.9-rc2-bk7/drivers/char/esp.c~msleep_interruptible-drivers_char_esp 2004-09-21 21:08:02.000000000 +0200 +++ linux-2.6.9-rc2-bk7-max/drivers/char/esp.c 2004-09-21 21:08:02.000000000 +0200 @@ -57,6 +57,7 @@ #include #include #include +#include #include #include @@ -2074,8 +2075,7 @@ static void rs_close(struct tty_struct * if (info->blocked_open) { if (info->close_delay) { - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(info->close_delay); + msleep_interruptible(jiffies_to_msecs(info->close_delay)); } wake_up_interruptible(&info->open_wait); } @@ -2106,8 +2106,7 @@ static void rs_wait_until_sent(struct tt while ((serial_in(info, UART_ESI_STAT1) != 0x03) || (serial_in(info, UART_ESI_STAT2) != 0xff)) { - set_current_state(TASK_INTERRUPTIBLE); - schedule_timeout(char_time); + msleep_interruptible(jiffies_to_msecs(char_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/