Linux 2.6.37-rc3-git3
This commit is contained in:
parent
e31d248b5c
commit
ea17f5cd11
2
.gitignore
vendored
2
.gitignore
vendored
@ -4,4 +4,4 @@ clog
|
||||
*.rpm
|
||||
kernel-2.6.*/
|
||||
/patch-2.6.37-rc3.bz2
|
||||
/patch-2.6.37-rc3-git2.bz2
|
||||
/patch-2.6.37-rc3-git3.bz2
|
||||
|
@ -1,15 +1,15 @@
|
||||
diff --git a/drivers/char/tty_io.c b/drivers/char/tty_io.c
|
||||
index 613c852..09c86d2 100644
|
||||
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
|
||||
@@ -1322,7 +1322,11 @@ static int tty_reopen(struct tty_struct *tty)
|
||||
@@ -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);
|
||||
|
@ -84,7 +84,7 @@ Summary: The Linux kernel
|
||||
# The rc snapshot level
|
||||
%define rcrev 3
|
||||
# The git snapshot level
|
||||
%define gitrev 2
|
||||
%define gitrev 3
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 2.6.%{upstream_sublevel}
|
||||
%endif
|
||||
@ -1906,6 +1906,10 @@ fi
|
||||
# || ||
|
||||
|
||||
%changelog
|
||||
* Fri Nov 26 2010 Kyle McMartin <kyle@redhat.com> 2.6.37-0.rc3.git3.1
|
||||
- Linux 2.6.37-rc3-git3
|
||||
- Print tty->flags as well in debugging patch...
|
||||
|
||||
* Fri Nov 26 2010 Kyle McMartin <kyle@redhat.com>
|
||||
- Copy tty_open WARN_ON debugging patch from rawhide.
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user