From: Geert Uytterhoeven <geert@linux-m68k.org>
To: Linus Torvalds <torvalds@osdl.org>,
Alan Cox <alan@lxorguk.ukuu.org.uk>,
Andrew Morton <akpm@osdl.org>
Cc: Kernel Mailing List <linux-kernel@vger.kernel.org>
Subject: [PATCH] tty fall-out (was: Re: Linux 2.6.9-rc3)
Date: Fri, 1 Oct 2004 15:49:10 +0200 (CEST) [thread overview]
Message-ID: <Pine.LNX.4.61.0410011546590.26491@anakin> (raw)
In-Reply-To: <Pine.LNX.4.58.0409292036010.2976@ppc970.osdl.org>
On Wed, 29 Sep 2004, Linus Torvalds wrote:
> Alan Cox:
> o tty locking cleanup and fixes
The two patches below (compile)fix some fall-out from the tty cleanups.
Signed-off-by: Geert Uytterhoeven <geert@linux-m68k.org>
--- linux-2.6.9-rc3/drivers/char/generic_serial.c.orig 2004-09-30 12:53:35.000000000 +0200
+++ linux-2.6.9-rc3/drivers/char/generic_serial.c 2004-10-01 12:47:40.000000000 +0200
@@ -691,7 +691,7 @@ void gs_close(struct tty_struct * tty, s
unsigned long flags;
struct gs_port *port;
- func_enter ()
+ func_enter ();
if (!tty) return;
--- linux-2.6.9-rc3/drivers/char/moxa.c.orig 2004-09-30 12:53:35.000000000 +0200
+++ linux-2.6.9-rc3/drivers/char/moxa.c 2004-10-01 12:43:17.000000000 +0200
@@ -952,7 +952,7 @@ static void moxa_poll(unsigned long igno
if (MoxaPortTxQueue(ch->port) <= WAKEUP_CHARS) {
if (!tp->stopped) {
ch->statusflags &= ~LOWWAIT;
- tty_wakeup(tty);
+ tty_wakeup(tp);
wake_up_interruptible(&tp->write_wait);
}
}
@@ -1119,7 +1119,7 @@ static void check_xmit_empty(unsigned lo
if (ch->tty && (ch->statusflags & EMPTYWAIT)) {
if (MoxaPortTxQueue(ch->port) == 0) {
ch->statusflags &= ~EMPTYWAIT;
- tty_wakeup(tty);
+ tty_wakeup(ch->tty);
wake_up_interruptible(&ch->tty->write_wait);
return;
}
Gr{oetje,eeting}s,
Geert
--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
-- Linus Torvalds
prev parent reply other threads:[~2004-10-01 13:49 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-09-30 3:37 Linux 2.6.9-rc3 Linus Torvalds
2004-09-30 4:53 ` Markus T.
2004-09-30 4:59 ` Tom Duffy
2004-09-30 5:02 ` Gene Heskett
2004-09-30 6:29 ` Clemens Schwaighofer
2004-09-30 7:30 ` James Bruce
2004-09-30 7:33 ` Clemens Schwaighofer
2004-09-30 15:53 ` Ingo Saitz
2004-09-30 20:27 ` Gene Heskett
2004-09-30 21:55 ` Jeff Garzik
2004-10-01 0:42 ` Clemens Schwaighofer
2004-10-01 3:30 ` Gene Heskett
2004-10-01 3:34 ` Clemens Schwaighofer
2004-10-01 4:01 ` Gene Heskett
2004-10-01 4:05 ` Clemens Schwaighofer
2004-10-01 4:06 ` Gene Heskett
2004-10-01 3:17 ` Gene Heskett
2004-10-01 5:44 ` Christian Hesse
2004-09-30 18:58 ` Bill Davidsen
2004-09-30 20:32 ` Gene Heskett
2004-09-30 5:03 ` Tom Duffy
2004-09-30 5:14 ` Marcel Holtmann
2004-09-30 5:33 ` Tom Duffy
2004-09-30 5:20 ` Gene Heskett
2004-09-30 5:24 ` Marcel Holtmann
2004-09-30 20:41 ` Gene Heskett
2004-09-30 14:13 ` Linux 2.6.9-rc3 (compile stats) John Cherry
2004-09-30 19:03 ` Linux 2.6.9-rc3 Bill Davidsen
2004-10-01 13:49 ` Geert Uytterhoeven [this message]
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=Pine.LNX.4.61.0410011546590.26491@anakin \
--to=geert@linux-m68k.org \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=linux-kernel@vger.kernel.org \
--cc=torvalds@osdl.org \
/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
all inboxes | Powered by JetHome®