r1586 - in trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian: . patches patches/series

[Simon Horman]

Author: horms
Date: 2004-09-14 04:46:05 -0600 (Tue, 14 Sep 2004)
New Revision: 1586

Added:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/089_alpha_include_ptrace.diff
Modified:
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
   trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6
Log:

Add asm/ptrace.h include as it is needed for pt_regs.
    Origin: Jan-Jaap van der Heijden <J.J.vanderHeijden@home.nl>


Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-09-14 10:30:02 UTC (rev 1585)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/changelog	2004-09-14 10:46:05 UTC (rev 1586)
@@ -4,6 +4,11 @@
     to upstream.
   * Annotate all diffs for the same purpose.
   * Fix $(upstream) regex, thanks Michael Tokarev. 
+  * Add asm/ptrace.h include as it is needed for pt_regs.
+    Origin: Jan-Jaap van der Heijden <J.J.vanderHeijden@home.nl> 
+    Added to Debian Tree: Simon Horman <horms@debian.org>
+    (Closes: #271533)
+    . include/asm-alpha/unistd.h
 
  -- Joshua Kwan <joshk@triplehelix.org>  Mon, 13 Sep 2004 06:54:17 -0700
 

Added: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/089_alpha_include_ptrace.diff
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/089_alpha_include_ptrace.diff	2004-09-14 10:30:02 UTC (rev 1585)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/089_alpha_include_ptrace.diff	2004-09-14 10:46:05 UTC (rev 1586)
@@ -0,0 +1,48 @@
+# origin: Debian (J.J.vanderHeijden@home.nl)
+# cset: n/a
+# inclusion: sent to upstream
+# description: add missing include to asm-alpha/unistd.h
+# revision date: 2004-09-14
+
+I'm trying to build alsa-modules from alsa source for
+kernel-image-2.4.27-1-generic (sarge). If I try to build support for all
+cards, it stops with an error in <asm-alpha/unistd.h>.
+
+It turns out that in <asm-alpha/unistd.h> a struct pt_regs regs is
+declared without including <asm-alpha/ptrace.h> where it is defined. In 2.6.8
+this is fixed (it includes ptrace.h plus a bunch of others).
+
+So, I propose this fix:
+
+--- a/include/asm-alpha/unistd.h	2004-09-13 12:13:22.000000000 +0200
++++ b/include/asm-alpha/unistd.h	2004-09-13 12:14:49.000000000 +0200
+@@ -519,6 +519,7 @@
+
+ #include <linux/string.h>
+ #include <linux/signal.h>
++#include <asm/ptrace.h>
+
+ extern void sys_idle(void);
+ static inline void idle(void)
+
+
+-- System Information:
+Debian Release: 3.1
+  APT prefers testing
+  APT policy: (500, 'testing')
+Architecture: alpha
+Kernel: Linux 2.4.27-1-generic
+Locale: LANG=C, LC_CTYPE=C
+
+Versions of packages kernel-image-2.4.27-1-generic depends on:
+ii  coreutils [fileutils]         5.2.1-2    The GNU core utilities
+ii  initrd-tools                  0.1.74     tools to create initrd image for p
+ii  modutils                      2.4.26-1   Linux module utilities
+
+-- no debconf information
+
+
+-- 
+To UNSUBSCRIBE, email to debian-kernel-REQUEST@lists.debian.org
+with a subject of "unsubscribe". Trouble? Contact listmaster@lists.debian.org
+

Modified: trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6
===================================================================
--- trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6	2004-09-14 10:30:02 UTC (rev 1585)
+++ trunk/kernel-2.4/source/kernel-source-2.4.27-2.4.27/debian/patches/series/2.4.27-6	2004-09-14 10:46:05 UTC (rev 1586)
@@ -17,3 +17,4 @@
 + 086_ver_linux_ld.diff
 + 087_mkdep_xargs.diff
 + 088_dont_use_infobox.diff
++ 089_alpha_include_ptrace.diff