r1910 - in trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian: . patches patches/series
Andres Salomon
dilinger-guest@haydn.debian.org
Wed, 24 Nov 2004 23:16:50 -0700
Author: dilinger-guest
Date: 2004-11-24 23:16:40 -0700 (Wed, 24 Nov 2004)
New Revision: 1910
Added:
trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-ide-dma-ricoh.dpatch
trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/fs-tmpfs-free_inode-leak.dpatch
trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/sparc32-initrd-memcpy.dpatch
trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/sparc64-sunsab-break-fix.dpatch
Modified:
trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-3
Log:
forward port max's misc fixes from -9, and a few more of joshk's sparc fixes
Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog 2004-11-25 06:11:09 UTC (rev 1909)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/changelog 2004-11-25 06:16:40 UTC (rev 1910)
@@ -24,6 +24,14 @@
* VLAN updates (Potential fix for: Bug#280743) (Simon Horman)
+ * Remove bogus DMA blacklist for RICOH CD-R/RW MP7083A (Maximilian Attems)
+
+ * tmpfs inode accounting leak fix (Maximilian Attems)
+
+ * sparc fixes from ML (Joshua Kwan):
+ - sparc32: fix memcpy() bug that caused ramdisk failure (Jurij Smakov)
+ - sparc64: don't let breaks get eaten by sunsab (Jurij Smakov)
+
-- Andres Salomon <dilinger@voxel.net> Thu, 25 Nov 2004 00:20:47 -0500
kernel-source-2.6.9 (2.6.9-2) unstable; urgency=low
Added: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-ide-dma-ricoh.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-ide-dma-ricoh.dpatch 2004-11-25 06:11:09 UTC (rev 1909)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/drivers-ide-dma-ricoh.dpatch 2004-11-25 06:16:40 UTC (rev 1910)
@@ -0,0 +1,21 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: bogus blacklist RICOH CD-R/RW MP7083A
+## DP: Patch author: Srihari Vijayaraghavan <sriharivijayaraghavan@yahoo.com.au>
+## DP: Upstream status: backport 2.6.10-rc2
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+--- a/drivers/ide/ide-dma.c 2004-11-18 11:37:48 -08:00
++++ b/drivers/ide/ide-dma.c 2004-11-18 11:37:48 -08:00
+@@ -129,7 +129,6 @@
+ { "CD-532E-A" , "ALL" },
+ { "E-IDE CD-ROM CR-840", "ALL" },
+ { "CD-ROM Drive/F5A", "ALL" },
+- { "RICOH CD-R/RW MP7083A", "ALL" },
+ { "WPI CDD-820", "ALL" },
+ { "SAMSUNG CD-ROM SC-148C", "ALL" },
+ { "SAMSUNG CD-ROM SC-148F", "ALL" },
Added: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/fs-tmpfs-free_inode-leak.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/fs-tmpfs-free_inode-leak.dpatch 2004-11-25 06:11:09 UTC (rev 1909)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/fs-tmpfs-free_inode-leak.dpatch 2004-11-25 06:16:40 UTC (rev 1910)
@@ -0,0 +1,24 @@
+#! /bin/sh -e
+## <PATCHNAME>.dpatch by <PATCH_AUTHOR@EMAI>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Description: tmpfs free_inodes leak
+## DP: Patch author: Hugh Dickins <hugh@veritas.com>
+## DP: Upstream status: backport 2.6.10-rc2
+
+. $(dirname $0)/DPATCH
+
+@DPATCH@
+--- a/mm/shmem.c 2004-11-18 12:12:40 -08:00
++++ b/mm/shmem.c 2004-11-18 12:12:40 -08:00
+@@ -1221,6 +1221,10 @@
+ case S_IFLNK:
+ break;
+ }
++ } else if (sbinfo) {
++ spin_lock(&sbinfo->stat_lock);
++ sbinfo->free_inodes++;
++ spin_unlock(&sbinfo->stat_lock);
+ }
+ return inode;
+ }
Modified: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-3
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-3 2004-11-25 06:11:09 UTC (rev 1909)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/series/2.6.9-3 2004-11-25 06:16:40 UTC (rev 1910)
@@ -9,3 +9,7 @@
- ata_piix-combinde-mode-fix.dpatch
+ ata_piix-combinde-mode-fix-2.dpatch
+ vlan-update-1.dpatch
++ drivers-ide-dma-ricoh.dpatch
++ fs-tmpfs-free_inode-leak.dpatch
++ sparc32-initrd-memcpy.dpatch
++ sparc64-sunsab-break-fix.dpatch
Added: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/sparc32-initrd-memcpy.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/sparc32-initrd-memcpy.dpatch 2004-11-25 06:11:09 UTC (rev 1909)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/sparc32-initrd-memcpy.dpatch 2004-11-25 06:16:40 UTC (rev 1910)
@@ -0,0 +1,27 @@
+# origin: Debian (jurij)
+# cset: n/a
+# inclusion: approved by davem (projected: 2.4.28)
+# revision date: 2004-11-15
+
+--- build-sparc32.orig/include/asm-sparc/string.h 2004-08-14 01:36:11.000000000 -0400
++++ build-sparc32/include/asm-sparc/string.h 2004-11-14 22:09:49.000000000 -0500
+@@ -40,6 +40,9 @@
+
+ if(n <= 32) {
+ __builtin_memcpy(to, from, n);
++ } else if (((unsigned int) to & 7) != 0) {
++ /* Destination is not aligned on the double-word boundary */
++ __memcpy(to, from, n);
+ } else {
+ switch(n) {
+ case PAGE_SIZE:
+--- build-sparc32.orig/arch/sparc/mm/iommu.c 2004-08-14 01:38:08.000000000 -0400
++++ build-sparc32/arch/sparc/mm/iommu.c 2004-11-14 22:10:09.000000000 -0500
+@@ -173,6 +173,7 @@
+ }
+
+ iommu_viking_flush_iotlb(iopte0, npages);
++ flush_cache_all();
+
+ return busa0;
+ }
Added: trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/sparc64-sunsab-break-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/sparc64-sunsab-break-fix.dpatch 2004-11-25 06:11:09 UTC (rev 1909)
+++ trunk/kernel/source/kernel-source-2.6.9-2.6.9/debian/patches/sparc64-sunsab-break-fix.dpatch 2004-11-25 06:16:40 UTC (rev 1910)
@@ -0,0 +1,52 @@
+# origin: Debian (jurij)
+# cset: n/a
+# inclusion: submitted
+# revision date: 2004-11-21
+
+--- build-sparc64.orig/drivers/serial/sunsab.c 2004-11-21 12:03:51.282281488 -0500
++++ build-sparc64/drivers/serial/sunsab.c 2004-11-21 11:49:04.000000000 -0500
+@@ -143,6 +143,11 @@
+ writeb(SAB82532_CMDR_RMC, &up->regs->w.cmdr);
+ }
+
++ /* Count may be zero for BRK, so we check for it here */
++ if((stat->sreg.isr1 & SAB82532_ISR1_BRK) &&
++ (up->port.line == up->port.cons->index))
++ saw_console_brk = 1;
++
+ for (i = 0; i < count; i++) {
+ unsigned char ch = buf[i];
+
+@@ -172,8 +177,6 @@
+ stat->sreg.isr0 &= ~(SAB82532_ISR0_PERR |
+ SAB82532_ISR0_FERR);
+ up->port.icount.brk++;
+- if (up->port.line == up->port.cons->index)
+- saw_console_brk = 1;
+ /*
+ * We do the SysRQ and SAK checking
+ * here because otherwise the break
+@@ -325,8 +328,9 @@
+
+ tty = NULL;
+ if (status.stat) {
+- if (status.sreg.isr0 & (SAB82532_ISR0_TCD | SAB82532_ISR0_TIME |
+- SAB82532_ISR0_RFO | SAB82532_ISR0_RPF))
++ if ((status.sreg.isr0 & (SAB82532_ISR0_TCD | SAB82532_ISR0_TIME |
++ SAB82532_ISR0_RFO | SAB82532_ISR0_RPF)) ||
++ (status.sreg.isr1 & SAB82532_ISR1_BRK))
+ tty = receive_chars(up, &status, regs);
+ if ((status.sreg.isr0 & SAB82532_ISR0_CDSC) ||
+ (status.sreg.isr1 & SAB82532_ISR1_CSC))
+@@ -352,8 +356,9 @@
+
+ tty = NULL;
+ if (status.stat) {
+- if (status.sreg.isr0 & (SAB82532_ISR0_TCD | SAB82532_ISR0_TIME |
+- SAB82532_ISR0_RFO | SAB82532_ISR0_RPF))
++ if ((status.sreg.isr0 & (SAB82532_ISR0_TCD | SAB82532_ISR0_TIME |
++ SAB82532_ISR0_RFO | SAB82532_ISR0_RPF)) ||
++ (status.sreg.isr1 & SAB82532_ISR1_BRK))
+ tty = receive_chars(up, &status, regs);
+ if ((status.sreg.isr0 & SAB82532_ISR0_CDSC) ||
+ (status.sreg.isr1 & (SAB82532_ISR1_BRK | SAB82532_ISR1_CSC)))