]> 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)
commitb4aab4098bfdc9499f0a96b79fbf6e2056c27165
tree6508ac81e94bfc137d1d9a55b973a2e0e0ac007b
parentbf02bba88747181e469c335b4770417f64bfc48e
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 7e450ea394aa ("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:

  f5ec3cb93fd7 - tty: add lockdep annotations
  b3660aeb466a - tty: fix ldisc lock inversion trace
  c7803fb3f92e - pty: Fix lock inversion
  91e3c4690c42 - tty: drop the pty lock during hangup
  dd7535374014 - tty/amiserial: Add missing argument for tty_unlock()
  7c1a58259a7e - cris: fix missing tty arg in wait_event_interruptible_tty call
  7e450ea394aa - 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