tty: fix switching consoles during suspend
in [Kernel]
|
Prev: [PATCH] Staging: memrar: Moved memrar_allocator struct into memrar_allocator.c
Next: [PATCH] s6e63m0: set permissions on gamma_table file to 0444
From: Arnd Bergmann on 23 Jun 2010 04:40 vt_waitactive now expects to be called with the big tty mutex, which it tries to release before going to sleep. This fixes the only caller that does not hold the BTM already. --- Greg, please apply to the tty series or fold into "tty: introduce wait_event_interruptible_tty", which introduces the problem. diff --git a/drivers/char/vt_ioctl.c b/drivers/char/vt_ioctl.c index 45410c8..2bbeaae 100644 --- a/drivers/char/vt_ioctl.c +++ b/drivers/char/vt_ioctl.c @@ -1761,10 +1761,13 @@ int vt_move_to_console(unsigned int vt, int alloc) return -EIO; } release_console_sem(); + tty_lock(); if (vt_waitactive(vt + 1)) { pr_debug("Suspend: Can't switch VCs."); + tty_unlock(); return -EINTR; } + tty_unlock(); return prev; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
From: Greg KH on 23 Jun 2010 18:30
On Wed, Jun 23, 2010 at 10:35:21AM +0200, Arnd Bergmann wrote: > vt_waitactive now expects to be called with the big tty mutex, which > it tries to release before going to sleep. > > This fixes the only caller that does not hold the BTM already. > --- > > Greg, please apply to the tty series or fold into > "tty: introduce wait_event_interruptible_tty", which introduces > the problem. Now folded in and pushed out. thanks, greg k-h -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo(a)vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/ |