lkml.org 
[lkml]   [2011]   [Nov]   [16]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 2/5] TTY: ldisc, move wait idle to caller
    Date
    It is the only place where reinit is called from. And we really need
    to wait for the old ldisc to go once. Actually this is the place where
    the waiting originally was (before removed and re-added later).

    This will make the fix in the following patch easier to implement.

    Signed-off-by: Jiri Slaby <jslaby@suse.cz>
    Cc: Dave Young <hidave.darkstar@gmail.com>
    Cc: Dave Jones <davej@redhat.com>
    Cc: Ben Hutchings <ben@decadent.org.uk>
    Cc: Dmitriy Matrosov <sgf.dma@gmail.com>
    Cc: Alan Cox <alan@lxorguk.ukuu.org.uk>
    Cc: stable <stable@kernel.org>
    Cc: Greg Kroah-Hartman <gregkh@suse.de>
    ---
    drivers/tty/tty_ldisc.c | 4 ++--
    1 files changed, 2 insertions(+), 2 deletions(-)

    diff --git a/drivers/tty/tty_ldisc.c b/drivers/tty/tty_ldisc.c
    index 534d176..a69a755 100644
    --- a/drivers/tty/tty_ldisc.c
    +++ b/drivers/tty/tty_ldisc.c
    @@ -763,8 +763,6 @@ static int tty_ldisc_reinit(struct tty_struct *tty, int ldisc)
    if (IS_ERR(ld))
    return -1;

    - WARN_ON_ONCE(tty_ldisc_wait_idle(tty, 5 * HZ));
    -
    tty_ldisc_close(tty, tty->ldisc);
    tty_ldisc_put(tty->ldisc);
    tty->ldisc = NULL;
    @@ -848,6 +846,8 @@ void tty_ldisc_hangup(struct tty_struct *tty)
    it means auditing a lot of other paths so this is
    a FIXME */
    if (tty->ldisc) { /* Not yet closed */
    + WARN_ON_ONCE(tty_ldisc_wait_idle(tty, 5 * HZ));
    +
    if (reset == 0) {

    if (!tty_ldisc_reinit(tty, tty->termios->c_line))
    --
    1.7.7.3



    \
     
     \ /
      Last update: 2011-11-16 16:29    [W:5.179 / U:0.224 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site