Commit 3c06e6cb authored Jun 04, 2017 by Linus Torvalds

Merge tag 'tty-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty

Pull tty fix from Greg KH:
 "Here is a single tty core fix for 4.12-rc4. It reverts a patch that a
  lot of people reported as causing lockdep and other warnings.

  Right after I reverted this in my tree, it seems like another
  "correct" fix might have shown up, but it's too late in the release
  cycle to be messing with tty core locking, so let's just revert this
  for now to go back how things always have been and try it again for
  4.13.

  This has not been in linux-next as I only reverted it a few hours ago"

* tag 'tty-4.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  Revert "tty: fix port buffer locking"

parents e00811b4 fc098af1

drivers/tty/tty_port.c

+0 −2

Original line number	Diff line number	Diff line
		@@ -34,9 +34,7 @@ static int tty_port_default_receive_buf(struct tty_port *port,
		if (!disc)
		return 0;

		mutex_lock(&tty->atomic_write_lock);
		ret = tty_ldisc_receive_buf(disc, p, (char *)f, count);
		mutex_unlock(&tty->atomic_write_lock);

		tty_ldisc_deref(disc);

Admin message