r1368 - trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches
Joshua Kwan
joshk@haydn.debian.org
Sat, 28 Aug 2004 20:38:06 -0600
Author: joshk
Date: 2004-08-26 21:53:52 -0600 (Thu, 26 Aug 2004)
New Revision: 1368
Added:
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-5
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-sunsab-fix.dpatch
trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-syslog-register.dpatch
Log:
these patches allow d-i to work correctly on sparc64
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-5
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-5 2004-08-26 23:39:22 UTC (rev 1367)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/00list-5 2004-08-27 03:53:52 UTC (rev 1368)
@@ -0,0 +1,2 @@
+sparc64-sunsab-skip-fix
+sparc64-syslog-register
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-sunsab-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-sunsab-fix.dpatch 2004-08-26 23:39:22 UTC (rev 1367)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-sunsab-fix.dpatch 2004-08-27 03:53:52 UTC (rev 1368)
@@ -0,0 +1,67 @@
+#!/bin/sh -e
+# DP: sunsab serial fixes from David Miller.
+
+. $(dirname $0)/DPATCH
+
+Return-Path: <davem@redhat.com>
+X-Original-To: joshk@triplehelix.org
+Delivered-To: joshk@triplehelix.org
+Received: from mx1.redhat.com (mx1.redhat.com [66.187.233.31])
+ by triplehelix.org (Postfix) with ESMTP id 0500F2A9542
+ for <joshk@triplehelix.org>; Thu, 26 Aug 2004 18:11:06 -0700 (PDT)
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+ by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i7R1B5S0003909;
+ Thu, 26 Aug 2004 21:11:05 -0400
+Received: from devserv.devel.redhat.com (devserv.devel.redhat.com [172.16.58.1])
+ by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i7R1B5316504;
+ Thu, 26 Aug 2004 21:11:05 -0400
+Received: from cheetah.davemloft.net (localhost.localdomain [127.0.0.1])
+ by devserv.devel.redhat.com (8.12.11/8.12.10) with SMTP id i7R1B0WQ028230;
+ Thu, 26 Aug 2004 21:11:00 -0400
+Date: Thu, 26 Aug 2004 18:10:59 -0700
+From: "David S. Miller" <davem@redhat.com>
+To: Joshua Kwan <joshk@triplehelix.org>
+Cc: rmitchell@eds.com, sparclinux@vger.kernel.org,
+ debian-sparc@debian.org
+Subject: Re: [PATCH] SunSAB console problems in 2.6.x
+Message-Id: <20040826181059.140d7f3f.davem@redhat.com>
+In-Reply-To: <412E8395.7040709@triplehelix.org>
+References: <20040825233247.237c1fb1.davem@redhat.com>
+ <412D9FFE.9060206@eds.com>
+ <20040826132310.GH2333@phunnypharm.org>
+ <412E265C.7080004@eds.com>
+ <20040826170136.GB10029@phunnypharm.org>
+ <20040826131946.35ae3d97.davem@redhat.com>
+ <412E8395.7040709@triplehelix.org>
+X-Mailer: Sylpheed version 0.9.12 (GTK+ 1.2.10; sparc-unknown-linux-gnu)
+X-Face: "_;p5u5aPsO,_Vsx"^v-pEq09'CU4&Dc1$fQExov$62l60cgCc%FnIwD=.UF^a>?5'9Kn[;433QFVV9M..2eN.@4ZWPGbdi<=?[:T>y?SD(R*-3It"Vj:)"dP
+Mime-Version: 1.0
+Content-Type: text/plain; charset=US-ASCII
+Content-Transfer-Encoding: 7bit
+X-CRM114-Version: 20040816.BlameClockworkOrange-auto.3 (regex: TRE 0.6.8) MF-A10FFB4C
+X-CRM114-Status: Good ( pR: 106.6244 )
+
+On Thu, 26 Aug 2004 17:43:01 -0700
+Joshua Kwan <joshk@triplehelix.org> wrote:
+
+> David S. Miller wrote:
+> > 2) Once userland starts up, the userland messages print out fine
+> > but are kernel messages still garbled?
+>
+> Right now I can say yes to this.
+
+Hmmm, does this fix things?
+
+===== drivers/serial/sunsab.c 1.35 vs edited =====
+--- 1.35/drivers/serial/sunsab.c 2004-08-26 15:38:22 -07:00
++++ edited/drivers/serial/sunsab.c 2004-08-26 17:54:26 -07:00
+@@ -83,7 +83,7 @@
+
+ static __inline__ void sunsab_tec_wait(struct uart_sunsab_port *up)
+ {
+- int timeout = up->tec_timeout;
++ int timeout = SAB82532_MAX_TEC_TIMEOUT /*up->tec_timeout*/;
+
+ while ((readb(&up->regs->r.star) & SAB82532_STAR_TEC) && --timeout)
+ udelay(1);
+
Added: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-syslog-register.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-syslog-register.dpatch 2004-08-26 23:39:22 UTC (rev 1367)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/sparc64-syslog-register.dpatch 2004-08-27 03:53:52 UTC (rev 1368)
@@ -0,0 +1,64 @@
+#!/bin/sh -e
+# DP: syslog 32-bit compat function was using the wrong registers.
+
+. $(dirname $0)/DPATCH
+
+Return-Path: <davem@redhat.com>
+X-Original-To: joshk@triplehelix.org
+Delivered-To: joshk@triplehelix.org
+Received: from mx1.redhat.com (mx1.redhat.com [66.187.233.31])
+ by triplehelix.org (Postfix) with ESMTP id 1F4DB2A9542
+ for <joshk@triplehelix.org>; Thu, 26 Aug 2004 18:06:41 -0700 (PDT)
+Received: from int-mx1.corp.redhat.com (int-mx1.corp.redhat.com [172.16.52.254])
+ by mx1.redhat.com (8.12.10/8.12.10) with ESMTP id i7R16eS0003067;
+ Thu, 26 Aug 2004 21:06:40 -0400
+Received: from devserv.devel.redhat.com (devserv.devel.redhat.com [172.16.58.1])
+ by int-mx1.corp.redhat.com (8.11.6/8.11.6) with ESMTP id i7R16Z316038;
+ Thu, 26 Aug 2004 21:06:35 -0400
+Received: from cheetah.davemloft.net (localhost.localdomain [127.0.0.1])
+ by devserv.devel.redhat.com (8.12.11/8.12.10) with SMTP id i7R16S8q027597;
+ Thu, 26 Aug 2004 21:06:31 -0400
+Date: Thu, 26 Aug 2004 18:06:28 -0700
+From: "David S. Miller" <davem@redhat.com>
+To: Joshua Kwan <joshk@triplehelix.org>
+Cc: sparclinux@vger.kernel.org, debian-sparc@debian.org
+Subject: Re: [2.6] busybox EFAULT on sparc64
+Message-Id: <20040826180628.1fd4e09f.davem@redhat.com>
+In-Reply-To: <pan.2004.08.27.00.57.25.841201@triplehelix.org>
+References: <20040818235528.GA8070@triplehelix.org>
+ <20040819095200.14bb9100.davem@redhat.com>
+ <20040819220259.4007f378.davem@redhat.com>
+ <pan.2004.08.27.00.57.25.841201@triplehelix.org>
+X-Mailer: Sylpheed version 0.9.12 (GTK+ 1.2.10; sparc-unknown-linux-gnu)
+X-Face: "_;p5u5aPsO,_Vsx"^v-pEq09'CU4&Dc1$fQExov$62l60cgCc%FnIwD=.UF^a>?5'9Kn[;433QFVV9M..2eN.@4ZWPGbdi<=?[:T>y?SD(R*-3It"Vj:)"dP
+Mime-Version: 1.0
+Content-Type: text/plain; charset=US-ASCII
+Content-Transfer-Encoding: 7bit
+X-CRM114-Version: 20040816.BlameClockworkOrange-auto.3 (regex: TRE 0.6.8) MF-A10FFB4C
+X-CRM114-Status: Good ( pR: 106.0078 )
+
+On Thu, 26 Aug 2004 17:57:27 -0700
+Joshua Kwan <joshk@triplehelix.org> wrote:
+
+> syslog(0x2, 0xefffed20, 0x1000
+>
+> At this point everything hangs. I'm not sure if there's another four
+> digits after the 0x1000.
+>
+> Ideas?
+
+This should fix it.
+
+===== arch/sparc64/kernel/sys32.S 1.9 vs edited =====
+--- 1.9/arch/sparc64/kernel/sys32.S 2004-06-03 14:51:21 -07:00
++++ edited/arch/sparc64/kernel/sys32.S 2004-08-26 17:49:39 -07:00
+@@ -120,7 +120,7 @@
+ SIGN2(sys32_setpgid, sys_setpgid, %o0, %o1)
+ SIGN3(sys32_setpriority, sys_setpriority, %o0, %o1, %o2)
+ SIGN1(sys32_ssetmask, sys_ssetmask, %o0)
+-SIGN2(sys32_syslog, sys_syslog, %o0, %o1)
++SIGN2(sys32_syslog, sys_syslog, %o0, %o2)
+ SIGN1(sys32_umask, sys_umask, %o0)
+ SIGN3(sys32_tgkill, sys_tgkill, %o0, %o1, %o2)
+ SIGN1(sys32_sendto, sys_sendto, %o0)
+