OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vt: waitevent is self locked so drop the tty_lock 

Signed-off-by: Alan Cox <alan@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alan Cox 2012-03-02 14:59:49 +00:00 committed by Greg Kroah-Hartman
parent 20f62579dc
commit 99cceb4e50
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/tty/vt/vt_ioctl.c
View File

@ -130,7 +130,7 @@ static void vt_event_wait(struct vt_event_wait *vw)
list_add(&vw->list, &vt_events); list_add(&vw->list, &vt_events);
spin_unlock_irqrestore(&vt_event_lock, flags); spin_unlock_irqrestore(&vt_event_lock, flags);
/* Wait for it to pass */ /* Wait for it to pass */
wait_event_interruptible_tty(vt_event_waitqueue, vw->done); wait_event_interruptible(vt_event_waitqueue, vw->done);
/* Dequeue it */ /* Dequeue it */
spin_lock_irqsave(&vt_event_lock, flags); spin_lock_irqsave(&vt_event_lock, flags);
list_del(&vw->list); list_del(&vw->list);
@ -671,11 +671,8 @@ int vt_ioctl(struct tty_struct *tty,
return -EPERM; return -EPERM;
if (arg == 0 || arg > MAX_NR_CONSOLES) if (arg == 0 || arg > MAX_NR_CONSOLES)
ret = -ENXIO; ret = -ENXIO;
else { else
tty_lock();
ret = vt_waitactive(arg); ret = vt_waitactive(arg);
tty_unlock();
}
break; break;
/* /*
@ -1426,14 +1423,10 @@ int vt_move_to_console(unsigned int vt, int alloc)
return -EIO; return -EIO;
} }
console_unlock(); console_unlock();
/* Review: I don't see why we need tty_lock here FIXME */
tty_lock();
if (vt_waitactive(vt + 1)) { if (vt_waitactive(vt + 1)) {
pr_debug("Suspend: Can't switch VCs."); pr_debug("Suspend: Can't switch VCs.");
tty_unlock();
return -EINTR; return -EINTR;
} }
tty_unlock();
return prev; return prev;
} }