]> git.baikalelectronics.ru Git - kernel.git/commit
tty: Revert the tty locking series, it needs more work
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Jun 2012 22:21:43 +0000 (15:21 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 2 Jun 2012 22:21:43 +0000 (15:21 -0700)
commit8c1f0e91caff12036f54ec89bd37d2aaea0162f7
tree6508ac81e94bfc137d1d9a55b973a2e0e0ac007b
parent4f45782083b402cb6bb82cf8bfb6e9eddeb24407
tty: Revert the tty locking series, it needs more work

This reverts the tty layer change to use per-tty locking, because it's
not correct yet, and fixing it will require some more deep surgery.

The main revert is 07b4efe5b808 ("tty_lock: Localise the lock"), but
there are several smaller commits that built upon it, they also get
reverted here. The list of reverted commits is:

  71ec870392f1 - tty: add lockdep annotations
  552e387fb809 - tty: fix ldisc lock inversion trace
  df7acbcd4376 - pty: Fix lock inversion
  f2ffb9e46f7d - tty: drop the pty lock during hangup
  03716e223944 - tty/amiserial: Add missing argument for tty_unlock()
  0154317b0b4e - cris: fix missing tty arg in wait_event_interruptible_tty call
  07b4efe5b808 - tty_lock: Localise the lock

The revert had a trivial conflict in the 68360serial.c staging driver
that got removed in the meantime.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
14 files changed:
drivers/tty/amiserial.c
drivers/tty/cyclades.c
drivers/tty/n_r3964.c
drivers/tty/pty.c
drivers/tty/serial/crisv10.c
drivers/tty/synclink.c
drivers/tty/synclink_gt.c
drivers/tty/synclinkmp.c
drivers/tty/tty_io.c
drivers/tty/tty_ldisc.c
drivers/tty/tty_mutex.c
drivers/tty/tty_port.c
include/linux/tty.h
net/bluetooth/rfcomm/tty.c