diff options
| author | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-26 22:58:39 -0500 |
|---|---|---|
| committer | Kyle McMartin <kyle@mcmartin.ca> | 2010-11-26 23:57:56 -0500 |
| commit | ea17f5cd11149cf323198d4b896819a925357bca (patch) | |
| tree | 6419e45032191cb8999db3822ec514125af87e16 | |
| parent | e31d248b5c211bc2e8138f04fcd47e1db35cdf1f (diff) | |
| download | kernel-ea17f5cd11149cf323198d4b896819a925357bca.tar.gz kernel-ea17f5cd11149cf323198d4b896819a925357bca.tar.xz kernel-ea17f5cd11149cf323198d4b896819a925357bca.zip | |
Linux 2.6.37-rc3-git3
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | debug-tty-print-dev-name.patch | 10 | ||||
| -rw-r--r-- | kernel.spec | 6 | ||||
| -rw-r--r-- | sources | 2 |
4 files changed, 12 insertions, 8 deletions
diff --git a/.gitignore b/.gitignore index 23dedec91..cd75a077e 100644 --- a/.gitignore +++ b/.gitignore @@ -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 diff --git a/debug-tty-print-dev-name.patch b/debug-tty-print-dev-name.patch index 9010b64fa..5c06dd991 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 +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); diff --git a/kernel.spec b/kernel.spec index 752361548..40ca1897e 100644 --- a/kernel.spec +++ b/kernel.spec @@ -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. @@ -1,3 +1,3 @@ 61f3739a73afb6914cb007f37fb09b62 linux-2.6.36.tar.bz2 9a487f01d20f9ee6917395a4c3de8ea7 patch-2.6.37-rc3.bz2 -29a4c06a0d766633f5be66cf98c6f378 patch-2.6.37-rc3-git2.bz2 +cff62cc3166b7ce55b272abc1f62deb9 patch-2.6.37-rc3-git3.bz2 |