From: janitor@sternwelten.at
To: rmk+lkml@arm.linux.org.uk
Cc: akpm@osdl.org, linux-kernel@vger.kernel.org,
janitor@sternwelten.at, nacc@us.ibm.com, gerg@snapgear.com
Subject: [patch 6/8] serial/mcfserial: replace schedule_timeout() with msleep_interruptible()
Date: Sun, 31 Oct 2004 00:47:16 +0200 [thread overview]
Message-ID: <E1CO20C-0003BB-Co@sputnik> (raw)
Any comments would be appreciated.
Description: Use msleep_interruptible() instead of schedule_timeout() to
guarantee the task delays as expected. Use set_current_state() instead
of direct assignment of current->state.
Acked-by: Greg Ungerer <gerg@snapgear.com>
Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Maximilian Attems <janitor@sternwelten.at>
---
linux-2.6.10-rc1-max/drivers/serial/mcfserial.c | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff -puN drivers/serial/mcfserial.c~msleep_interruptible-drivers_serial_mcfserial drivers/serial/mcfserial.c
--- linux-2.6.10-rc1/drivers/serial/mcfserial.c~msleep_interruptible-drivers_serial_mcfserial 2004-10-24 17:05:29.000000000 +0200
+++ linux-2.6.10-rc1-max/drivers/serial/mcfserial.c 2004-10-24 17:05:29.000000000 +0200
@@ -35,6 +35,7 @@
#include <linux/console.h>
#include <linux/init.h>
#include <linux/bitops.h>
+#include <linux/delay.h>
#include <asm/io.h>
#include <asm/irq.h>
@@ -978,7 +979,7 @@ static void send_break( struct mcf_seria
if (!info->addr)
return;
- current->state = TASK_INTERRUPTIBLE;
+ set_current_state(TASK_INTERRUPTIBLE);
uartp = info->addr;
local_irq_save(flags);
@@ -1230,8 +1231,7 @@ static void mcfrs_close(struct tty_struc
#endif
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);
}
@@ -1296,8 +1296,7 @@ mcfrs_wait_until_sent(struct tty_struct
fifo_cnt++;
if (fifo_cnt == 0)
break;
- set_current_state(TASK_INTERRUPTIBLE);
- schedule_timeout(char_time);
+ msleep_interruptible(jiffies_to_msecs(char_time));
if (signal_pending(current))
break;
if (timeout && time_after(jiffies, orig_jiffies + timeout))
_
next reply other threads:[~2004-10-30 22:49 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-10-30 22:47 janitor [this message]
2004-11-01 12:36 ` [patch 6/8] serial/mcfserial: replace schedule_timeout() with msleep_interruptible() Russell King
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1CO20C-0003BB-Co@sputnik \
--to=janitor@sternwelten.at \
--cc=akpm@osdl.org \
--cc=gerg@snapgear.com \
--cc=linux-kernel@vger.kernel.org \
--cc=nacc@us.ibm.com \
--cc=rmk+lkml@arm.linux.org.uk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox