r2970 - in trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian: . patches patches/series
Jurij Smakov
jurij-guest@costa.debian.org
Tue, 12 Apr 2005 02:25:15 +0000
Author: jurij-guest
Date: 2005-04-12 02:25:14 +0000 (Tue, 12 Apr 2005)
New Revision: 2970
Added:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-4
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc64-compat-nanoseconds.patch
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sunsab-uart-update-timeout.patch
Modified:
trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
Log:
* Started 2.6.11-4.
* Replaced sparc-sunsab-serial-lockup.patch with a more official
sunsab-uart-update-timeout.patch which performed marginally
better in testing.
* Added sparc64-compat-nanoseconds.patch correcting the filling
out of nanoseconds fields in 32-bit tasks in compat layer.
Modified: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog 2005-04-10 22:42:42 UTC (rev 2969)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/changelog 2005-04-12 02:25:14 UTC (rev 2970)
@@ -1,3 +1,17 @@
+kernel-source-2.6.11 (2.6.11-4) UNRELEASED; urgency=low
+
+ * [sparc64] Replaced sparc-sunsab-serial-lockup.patch by a more
+ official version approved by upstream (sunsab-uart-update-timeout.patch)
+ which appears to perform marginally better (Jurij Smakov).
+ Ref: http://lists.debian.org/debian-sparc/2005/04/msg00025.html
+
+ * [sparc64] Added sparc64-compat-nanoseconds.patch which takes care
+ of correctly filling out nanoseconds fields for 32-bit compat tasks
+ in the sparc64 compat layer (Jurij Smakov).
+ Ref: http://marc.theaimsgroup.com/?l=linux-sparc&m=111273516700128&w=2
+
+ -- Jurij Smakov <jurij@wooyd.org> Mon, 11 Apr 2005 22:17:01 -0400
+
kernel-source-2.6.11 (2.6.11-3) unstable; urgency=low
* Merge in 2.6.11.7; this includes:
Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-4
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-4 2005-04-10 22:42:42 UTC (rev 2969)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/series/2.6.11-4 2005-04-12 02:25:14 UTC (rev 2970)
@@ -0,0 +1,3 @@
+- sparc-sunsab-serial-lockup.patch
++ sunsab-uart-update-timeout.patch
++ sparc64-compat-nanoseconds.patch
Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc64-compat-nanoseconds.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc64-compat-nanoseconds.patch 2005-04-10 22:42:42 UTC (rev 2969)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sparc64-compat-nanoseconds.patch 2005-04-12 02:25:14 UTC (rev 2970)
@@ -0,0 +1,55 @@
+# From davem@davemloft.net Tue Apr 5 19:56:10 2005
+# Date: Tue, 5 Apr 2005 13:57:37 -0700
+# From: David S. Miller <davem@davemloft.net>
+# To: linux-kernel@vger.kernel.org
+# Cc: sparclinux@vger.kernel.org
+# Subject: [PATCH] Fix compat stat handling on sparc64
+#
+#
+# The compat layer on sparc64 was not filling in the nanosecond
+# fields in properly for 32-bit compat tasks. This caused things
+# like the test-utime.c test to fail in the libc sources.
+#
+# A problem still remains for native 64-bit binaries. Like Alpha
+# the normal stat structure doesn't have the nanosecond fields
+# so I have to add in the stat64 syscall entry points in the 64-bit
+# syscall table then add the necessary libc magic.
+#
+# Signed-off-by: David S. Miller <davem@davemloft.net>
+#
+# ===== arch/sparc64/kernel/sys_sparc32.c 1.118 vs edited =====
+--- 1.118/arch/sparc64/kernel/sys_sparc32.c 2005-03-21 09:56:06 -08:00
++++ edited/arch/sparc64/kernel/sys_sparc32.c 2005-04-05 12:38:54 -07:00
+@@ -352,11 +352,11 @@
+ err |= put_user(old_encode_dev(stat->rdev), &statbuf->st_rdev);
+ err |= put_user(stat->size, &statbuf->st_size);
+ err |= put_user(stat->atime.tv_sec, &statbuf->st_atime);
+- err |= put_user(0, &statbuf->__unused1);
++ err |= put_user(stat->atime.tv_nsec, &statbuf->st_atime_nsec);
+ err |= put_user(stat->mtime.tv_sec, &statbuf->st_mtime);
+- err |= put_user(0, &statbuf->__unused2);
++ err |= put_user(stat->mtime.tv_nsec, &statbuf->st_mtime_nsec);
+ err |= put_user(stat->ctime.tv_sec, &statbuf->st_ctime);
+- err |= put_user(0, &statbuf->__unused3);
++ err |= put_user(stat->ctime.tv_nsec, &statbuf->st_ctime_nsec);
+ err |= put_user(stat->blksize, &statbuf->st_blksize);
+ err |= put_user(stat->blocks, &statbuf->st_blocks);
+ err |= put_user(0, &statbuf->__unused4[0]);
+===== include/asm-sparc64/compat.h 1.19 vs edited =====
+--- 1.19/include/asm-sparc64/compat.h 2005-02-17 21:53:03 -08:00
++++ edited/include/asm-sparc64/compat.h 2005-04-05 12:37:58 -07:00
+@@ -51,11 +51,11 @@
+ compat_dev_t st_rdev;
+ compat_off_t st_size;
+ compat_time_t st_atime;
+- u32 __unused1;
++ u32 st_atime_nsec;
+ compat_time_t st_mtime;
+- u32 __unused2;
++ u32 st_mtime_nsec;
+ compat_time_t st_ctime;
+- u32 __unused3;
++ u32 st_ctime_nsec;
+ compat_off_t st_blksize;
+ compat_off_t st_blocks;
+ u32 __unused4[2];
Added: trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sunsab-uart-update-timeout.patch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sunsab-uart-update-timeout.patch 2005-04-10 22:42:42 UTC (rev 2969)
+++ trunk/kernel/source/kernel-source-2.6.11-2.6.11/debian/patches/sunsab-uart-update-timeout.patch 2005-04-12 02:25:14 UTC (rev 2970)
@@ -0,0 +1,94 @@
+# From davem@davemloft.net Mon Apr 4 21:25:41 2005
+# Date: Mon, 4 Apr 2005 12:21:35 -0700
+# From: David S. Miller <davem@davemloft.net>
+# To: Eric Brower <ebrower@gmail.com>
+# Cc: debian-sparc@lists.debian.org, ultralinux@vger.kernel.org
+# Subject: Re: Weird Mouse Behaviour with 2.6
+# Resent-Date: Mon, 4 Apr 2005 14:39:19 -0500 (CDT)
+# Resent-From: debian-sparc@lists.debian.org
+#
+# On Mon, 4 Apr 2005 11:11:01 -0700
+# Eric Brower <ebrower@gmail.com> wrote:
+#
+# > In tty_ioctl.c tty_wait_until_sent() if the timeout variable is set to
+# > zero (which many callers do explicitly) it gets reassigned to
+# > MAX_SCHEDULE_TIMEOUT (this is LONG_MAX). If there are no characters
+# > waiting to be sent (!tty->driver->chars_in_buffer(tty)) we drop out of
+# > our loop and supply the timeout variable to uart_wait_until_sent
+# > (tty->driver->wait_until_sent). The problem is uart_wait_until_sent
+# > is specified with a timeout argument of type int, not long. This
+# > becomes -1 in uart_wait_until_sent, which I don't think is intended.
+# > If your port->timeout value in this function is also zero (as seems
+# > the case with sunsab), this seems doubly bad and leads to massive
+# > mdelay times in uart_wait_until_sent. This will appear to you as a
+# > hung getty.
+#
+# Good catch. That third argument should be "unsigned long timeout"
+# indeed. I've pointed this out in private email to Russell, Linus
+# and Andrew.
+#
+# uart_update_timeout() calls done by the driver (in this case sunsab.c)
+# should be updating the port->timeout value properly. Indeed, sunsab.c
+# fails to call uart_update_timeout() at all.
+#
+# Hmmm, I wonder if the port->uartclk we use in sunsab.c needs to be
+# multiplied by 16, like sunsu.c does.
+#
+# Anyways, this patch below should be a step in the right direction.
+#
+===== drivers/serial/sunsab.c 1.38 vs edited =====
+--- 1.38/drivers/serial/sunsab.c 2004-12-08 21:31:16 -08:00
++++ edited/drivers/serial/sunsab.c 2005-04-04 12:17:25 -07:00
+@@ -682,7 +682,8 @@
+
+ /* Internal routine, port->lock is held and local interrupts are disabled. */
+ static void sunsab_convert_to_sab(struct uart_sunsab_port *up, unsigned int cflag,
+- unsigned int iflag, int baud)
++ unsigned int iflag, unsigned int baud,
++ unsigned int quot)
+ {
+ unsigned int ebrg;
+ unsigned char dafo;
+@@ -766,6 +767,9 @@
+ up->port.ignore_status_mask |= (SAB82532_ISR0_RPF |
+ SAB82532_ISR0_TCD);
+
++ uart_update_timeout(&up->port, cflag,
++ (up->port.uartclk / (16 * quot)));
++
+ /* Now bang the new settings into the chip. */
+ sunsab_cec_wait(up);
+ sunsab_tec_wait(up);
+@@ -784,10 +788,11 @@
+ {
+ struct uart_sunsab_port *up = (struct uart_sunsab_port *) port;
+ unsigned long flags;
+- int baud = uart_get_baud_rate(port, termios, old, 0, 4000000);
++ unsigned int baud = uart_get_baud_rate(port, termios, old, 0, 4000000);
++ unsigned int quot = uart_get_divisor(port, baud);
+
+ spin_lock_irqsave(&up->port.lock, flags);
+- sunsab_convert_to_sab(up, termios->c_cflag, termios->c_iflag, baud);
++ sunsab_convert_to_sab(up, termios->c_cflag, termios->c_iflag, baud, quot);
+ spin_unlock_irqrestore(&up->port.lock, flags);
+ }
+
+@@ -880,7 +885,7 @@
+ {
+ struct uart_sunsab_port *up = &sunsab_ports[con->index];
+ unsigned long flags;
+- int baud;
++ unsigned int baud, quot;
+
+ printk("Console: ttyS%d (SAB82532)\n",
+ (sunsab_reg.minor - 64) + con->index);
+@@ -926,7 +931,8 @@
+ SAB82532_IMR1_XPR;
+ writeb(up->interrupt_mask1, &up->regs->w.imr1);
+
+- sunsab_convert_to_sab(up, con->cflag, 0, baud);
++ quot = uart_get_divisor(&up->port, baud);
++ sunsab_convert_to_sab(up, con->cflag, 0, baud, quot);
+ sunsab_set_mctrl(&up->port, TIOCM_DTR | TIOCM_RTS);
+
+ spin_unlock_irqrestore(&up->port.lock, flags);