diff options
| author | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:29:24 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@redhat.com> | 2010-12-09 13:29:24 -0500 |
| commit | a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf (patch) | |
| tree | f24c9da1c1927f290aa3d1b640d7fa272860520d /debug-tty-print-dev-name.patch | |
| parent | ee99a68c51ebd08409e45b63796f3c971c27e3d6 (diff) | |
| parent | 98e6119f39d3b83af3b533bed6bcff0e096f2397 (diff) | |
| download | kernel-a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf.tar.gz kernel-a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf.tar.xz kernel-a3f45c4a9c4acadb3b0e3531a0d4d3649f711ebf.zip | |
Merge branch 'kernel-git' strategy 'theirs'
Conflicts:
xhci_hcd-suspend-resume.patch
Diffstat (limited to 'debug-tty-print-dev-name.patch')
| -rw-r--r-- | debug-tty-print-dev-name.patch | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/debug-tty-print-dev-name.patch b/debug-tty-print-dev-name.patch index 507dfe5f..5c06dd99 100644 --- a/debug-tty-print-dev-name.patch +++ b/debug-tty-print-dev-name.patch @@ -1,15 +1,15 @@ -diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c -index 613c852..09c86d2 100644 ---- a/drivers/char/tty_io.c -+++ b/drivers/char/tty_io.c -@@ -1322,7 +1322,11 @@ static int tty_reopen(struct tty_struct *tty) +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\n", -+ __func__, tty->name, tty->ldisc ? tty->ldisc->ops ? tty->ldisc->ops->name : NULL : NULL); ++ 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); |