The patch titled
tty: revert part of the termios locking
has been removed from the -mm tree. Its filename was
tty-revert-part-of-the-termios-locking.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: tty: revert part of the termios locking
From: Alan Cox <alan@xxxxxxxxxx>
vt: deadlock workaround
2.6.26 corrected the mutex locking on tty resizing to fix the case where
you could get the tty/vt sizing out of sync. That turns out to have a
deadlock.
The actual fix is really major and I've got it lined up as part of the ops
changes for 2.6.28 so for 2.6.26/2.6.27 it is safer to reintroduce this
ages old minor bug.
Addresses http://bugzilla.kernel.org/show_bug.cgi?id=11234
Signed-off-by: Alan Cox <alan@xxxxxxxxxx>
Reported-by: kouyu <ckyoog@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/char/vt.c | 2 --
1 file changed, 2 deletions(-)
diff -puN drivers/char/vt.c~tty-revert-part-of-the-termios-locking drivers/char/vt.c
--- a/drivers/char/vt.c~tty-revert-part-of-the-termios-locking
+++ a/drivers/char/vt.c
@@ -916,7 +916,6 @@ int vc_resize(struct vc_data *vc, unsign
ws.ws_col = vc->vc_cols;
ws.ws_ypixel = vc->vc_scan_lines;
- mutex_lock(&vc->vc_tty->termios_mutex);
spin_lock_irq(&vc->vc_tty->ctrl_lock);
if ((ws.ws_row != cws->ws_row || ws.ws_col != cws->ws_col))
pgrp = get_pid(vc->vc_tty->pgrp);
@@ -926,7 +925,6 @@ int vc_resize(struct vc_data *vc, unsign
put_pid(pgrp);
}
*cws = ws;
- mutex_unlock(&vc->vc_tty->termios_mutex);
}
if (CON_IS_VISIBLE(vc))
_
Patches currently in -mm which might be from alan@xxxxxxxxxx are
hamradio-add-missing-sanity-check-to-tty-operation.patch
drivers-net-skfp-pmfc-use-offsetof-macro.patch
i2o-fix-32-64bit-dma-locking.patch
fb-push-down-the-bkl-in-the-ioctl-handler.patch
fb-push-down-the-bkl-in-the-ioctl-handler-checkpatch-fixes.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
