diff options
author | Paul Fulghum <paulkf@microgate.com> | 2006-06-28 07:26:47 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-06-28 17:59:05 -0400 |
commit | 817d6d3bceaf34c99f5343820f9b9e6021f0655c (patch) | |
tree | 651104833124262db46c2a372b7adb55289cd8dd /drivers/serial | |
parent | e0ac4761fa52acda90f9f53819c81474b511e3af (diff) |
[PATCH] remove TTY_DONT_FLIP
Remove TTY_DONT_FLIP tty flag. This flag was introduced in 2.1.X kernels
to prevent the N_TTY line discipline functions read_chan() and
n_tty_receive_buf() from running at the same time. 2.2.15 introduced
tty->read_lock to protect access to the N_TTY read buffer, which is the
only state requiring protection between these two functions.
The current TTY_DONT_FLIP implementation is broken for SMP, and is not
universally honored by drivers that send data directly to the line
discipline receive_buf function.
Because TTY_DONT_FLIP is not necessary, is broken in implementation, and is
not universally honored, it is removed.
Signed-off-by: Paul Fulghum <paulkf@microgate.com>
Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
Cc: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers/serial')
-rw-r--r-- | drivers/serial/crisv10.c | 6 | ||||
-rw-r--r-- | drivers/serial/jsm/jsm_tty.c | 7 |
2 files changed, 0 insertions, 13 deletions
diff --git a/drivers/serial/crisv10.c b/drivers/serial/crisv10.c index 89700141f87e..5cacc5e74a92 100644 --- a/drivers/serial/crisv10.c +++ b/drivers/serial/crisv10.c | |||
@@ -2573,12 +2573,6 @@ static void flush_to_flip_buffer(struct e100_serial *info) | |||
2573 | 2573 | ||
2574 | DFLIP( | 2574 | DFLIP( |
2575 | if (1) { | 2575 | if (1) { |
2576 | |||
2577 | if (test_bit(TTY_DONT_FLIP, &tty->flags)) { | ||
2578 | DEBUG_LOG(info->line, "*** TTY_DONT_FLIP set flip.count %i ***\n", tty->flip.count); | ||
2579 | DEBUG_LOG(info->line, "*** recv_cnt %i\n", info->recv_cnt); | ||
2580 | } else { | ||
2581 | } | ||
2582 | DEBUG_LOG(info->line, "*** rxtot %i\n", info->icount.rx); | 2576 | DEBUG_LOG(info->line, "*** rxtot %i\n", info->icount.rx); |
2583 | DEBUG_LOG(info->line, "ldisc %lu\n", tty->ldisc.chars_in_buffer(tty)); | 2577 | DEBUG_LOG(info->line, "ldisc %lu\n", tty->ldisc.chars_in_buffer(tty)); |
2584 | DEBUG_LOG(info->line, "room %lu\n", tty->ldisc.receive_room(tty)); | 2578 | DEBUG_LOG(info->line, "room %lu\n", tty->ldisc.receive_room(tty)); |
diff --git a/drivers/serial/jsm/jsm_tty.c b/drivers/serial/jsm/jsm_tty.c index 7d823705193c..f8262e6ad8d3 100644 --- a/drivers/serial/jsm/jsm_tty.c +++ b/drivers/serial/jsm/jsm_tty.c | |||
@@ -589,13 +589,6 @@ void jsm_input(struct jsm_channel *ch) | |||
589 | ld = tty_ldisc_ref(tp); | 589 | ld = tty_ldisc_ref(tp); |
590 | 590 | ||
591 | /* | 591 | /* |
592 | * If the DONT_FLIP flag is on, don't flush our buffer, and act | ||
593 | * like the ld doesn't have any space to put the data right now. | ||
594 | */ | ||
595 | if (test_bit(TTY_DONT_FLIP, &tp->flags)) | ||
596 | len = 0; | ||
597 | |||
598 | /* | ||
599 | * If we were unable to get a reference to the ld, | 592 | * If we were unable to get a reference to the ld, |
600 | * don't flush our buffer, and act like the ld doesn't | 593 | * don't flush our buffer, and act like the ld doesn't |
601 | * have any space to put the data right now. | 594 | * have any space to put the data right now. |