r2059 - in trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian: . patches patches/series

Sven Luther luther@haydn.debian.org
Sun, 26 Dec 2004 05:01:11 -0700


Author: luther
Date: 2004-12-26 05:00:57 -0700 (Sun, 26 Dec 2004)
New Revision: 2059

Removed:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/alsa-signed-fix.dpatch
Modified:
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
   trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-11
Log:
Backing out again the alsa-signed-fix patch, as it doesn't apply to 2.6.8 kernels.


Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-12-26 11:35:36 UTC (rev 2058)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/changelog	2004-12-26 12:00:57 UTC (rev 2059)
@@ -80,10 +80,6 @@
     - Fix cg6 framebuffer initialization.
     - fix up VM fault code handling
 
-  * Added patch which fixes an signed vs. unsigned char problem in Alsa
-    which was the cause of the Oops people were experiencing on ppc with
-    OSS emulation and possibly other issues. (Sven Luther)
-
  -- Sven Luther <luther@debian.org>  Sun, 26 Dec 2004 12:29:39 +0100
 
 kernel-source-2.6.8 (2.6.8-10) unstable; urgency=high

Deleted: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/alsa-signed-fix.dpatch
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/alsa-signed-fix.dpatch	2004-12-26 11:35:36 UTC (rev 2058)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/alsa-signed-fix.dpatch	2004-12-26 12:00:57 UTC (rev 2059)
@@ -1,33 +0,0 @@
-#! /bin/sh -e 
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Description: fixes an signed vs. unsigned char problem in Alsa which
-## DP: Description: was the cause of the Oops people were experiencing on ppc
-## DP: Description: with OSS emulation and possibly other issues.
-## DP: Patch author: Benjamin Herrenschmidt <benh@kernel.crashing.org>
-## DP: Upstream status: will be sent upstream by the alsa folk.
-
-. $(dirname $0)/DPATCH
-
-@DPATCH@
---- linux/sound/core/pcm_misc.c 8 Jun 2004 16:57:28 -0000       1.12
-+++ linux/sound/core/pcm_misc.c 22 Dec 2004 18:07:29 -0000      1.14
-@@ -25,11 +25,14 @@
- #include <sound/pcm.h>
- #define SND_PCM_FORMAT_UNKNOWN (-1)
- 
-+/* NOTE: "signed" prefix must be given below since the default char is
-+ *       unsigned on some architectures!
-+ */
- struct pcm_format_data {
--       char width;     /* bit width */
--       char phys;      /* physical bit width */
--       char le;        /* 0 = big-endian, 1 = little-endian, -1 = others */
--       char signd;     /* 0 = unsigned, 1 = signed, -1 = others */
-+       unsigned char width;    /* bit width */
-+       unsigned char phys;     /* physical bit width */
-+       signed char le; /* 0 = big-endian, 1 = little-endian, -1 = others */
-+       signed char signd;      /* 0 = unsigned, 1 = signed, -1 = others */
-        unsigned char silence[8];       /* silence data to fill */
- };
-

Modified: trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-11
===================================================================
--- trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-11	2004-12-26 11:35:36 UTC (rev 2058)
+++ trunk/kernel/source/kernel-source-2.6.8-2.6.8/debian/patches/series/2.6.8-11	2004-12-26 12:00:57 UTC (rev 2059)
@@ -32,4 +32,3 @@
 + sparc32-sun4d-support.dpatch
 + sparc32-hypersparc-dvma.dpatch
 + sparc32-vm-fault-codes.dpatch
-+ alsa-signed-fix.dpatch