diff options
author | Kyle McMartin <kyle@redhat.com> | 2011-01-24 13:04:53 -0500 |
---|---|---|
committer | Kyle McMartin <kyle@redhat.com> | 2011-01-24 13:04:53 -0500 |
commit | a56ba88660b3af1717c0f8c03293a3ff9bfb186b (patch) | |
tree | 7e456538742fa76c2a56947c2bf28e97aa1d911b /debug-tty-print-dev-name.patch | |
parent | d8122d51beba66d4ac8525a97da60bb7a0ab9ede (diff) | |
download | kernel-a56ba88660b3af1717c0f8c03293a3ff9bfb186b.tar.gz kernel-a56ba88660b3af1717c0f8c03293a3ff9bfb186b.tar.xz kernel-a56ba88660b3af1717c0f8c03293a3ff9bfb186b.zip |
rebase runtime pm fixups and drop debug-tty-print-dev-name.patch
Diffstat (limited to 'debug-tty-print-dev-name.patch')
-rw-r--r-- | debug-tty-print-dev-name.patch | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/debug-tty-print-dev-name.patch b/debug-tty-print-dev-name.patch deleted file mode 100644 index 5c06dd991..000000000 --- a/debug-tty-print-dev-name.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/drivers/tty/tty_io.c b/drivers/tty/tty_io.c -index 878f6d6..8d6867d 100644 ---- a/drivers/tty/tty_io.c -+++ b/drivers/tty/tty_io.c -@@ -1329,7 +1330,11 @@ static int tty_reopen(struct tty_struct *tty) - tty->driver = driver; /* N.B. why do this every time?? */ - - mutex_lock(&tty->ldisc_mutex); -- WARN_ON(!test_bit(TTY_LDISC, &tty->flags)); -+ if (!test_bit(TTY_LDISC, &tty->flags)) { -+ printk("%s: !test_bit(TTY_LDISC, &tty->flags) dev=%s ldisc=%s flags=%x\n", -+ __func__, tty->name, tty->ldisc ? tty->ldisc->ops ? tty->ldisc->ops->name : NULL : NULL, tty->flags); -+ WARN_ON(1); -+ } - mutex_unlock(&tty->ldisc_mutex); - - return 0; |