lkml.org 
[lkml]   [2012]   [Mar]   [1]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4/6] vt: waitevent is self locked so drop the tty_lock
    Date
    From: Alan Cox <alan@linux.intel.com>

    Signed-off-by: Alan Cox <alan@linux.intel.com>
    ---

    drivers/tty/vt/vt_ioctl.c | 6 +-----
    1 files changed, 1 insertions(+), 5 deletions(-)


    diff --git a/drivers/tty/vt/vt_ioctl.c b/drivers/tty/vt/vt_ioctl.c
    index f0b5143..ede2ef1 100644
    --- a/drivers/tty/vt/vt_ioctl.c
    +++ b/drivers/tty/vt/vt_ioctl.c
    @@ -130,7 +130,7 @@ static void vt_event_wait(struct vt_event_wait *vw)
    list_add(&vw->list, &vt_events);
    spin_unlock_irqrestore(&vt_event_lock, flags);
    /* Wait for it to pass */
    - wait_event_interruptible_tty(vt_event_waitqueue, vw->done);
    + wait_event_interruptible(vt_event_waitqueue, vw->done);
    /* Dequeue it */
    spin_lock_irqsave(&vt_event_lock, flags);
    list_del(&vw->list);
    @@ -1423,14 +1423,10 @@ int vt_move_to_console(unsigned int vt, int alloc)
    return -EIO;
    }
    console_unlock();
    - /* Review: I don't see why we need tty_lock here FIXME */
    - tty_lock();
    if (vt_waitactive(vt + 1)) {
    pr_debug("Suspend: Can't switch VCs.");
    - tty_unlock();
    return -EINTR;
    }
    - tty_unlock();
    return prev;
    }



    \
     
     \ /
      Last update: 2012-03-01 20:39    [W:0.020 / U:30.472 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site