r1651 - in linux-kernel-headers/trunk/debian: . patches
Author: schizo
Date: 2006-06-11 06:27:48 +0000 (Sun, 11 Jun 2006)
New Revision: 1651
Added:
linux-kernel-headers/trunk/debian/patches/asm-powerpc-unaligned.patch
Modified:
linux-kernel-headers/trunk/debian/changelog
linux-kernel-headers/trunk/debian/generate-asm.sh
linux-kernel-headers/trunk/debian/patches/asm-types-long-long.patch
linux-kernel-headers/trunk/debian/patches/series
linux-kernel-headers/trunk/debian/rules
Log:
* debian/generate-asm.sh: remove all vestigial powerpc stuff
* debian/patches/asm-types-long-long.patch: fix powerpc
* debian/rules: remove generate-asm for ppc/ppc64
* Add asm-powerpc-unaligned.patch.
Modified: linux-kernel-headers/trunk/debian/changelog
===================================================================
--- linux-kernel-headers/trunk/debian/changelog 2006-06-10 22:36:17 UTC (rev 1650)
+++ linux-kernel-headers/trunk/debian/changelog 2006-06-11 06:27:48 UTC (rev 1651)
@@ -1,3 +1,12 @@
+linux-kernel-headers (2.6.16.20-4) unstable; urgency=low
+
+ * debian/generate-asm.sh: remove all vestigial powerpc stuff
+ * debian/patches/asm-types-long-long.patch: fix powerpc
+ * debian/rules: remove generate-asm for ppc/ppc64
+ * Add asm-powerpc-unaligned.patch.
+
+ -- Clint Adams <schizo@debian.org> Sun, 11 Jun 2006 02:26:00 -0400
+
linux-kernel-headers (2.6.16.20-3) unstable; urgency=low
* Fix byteorder-const.patch on arm.
Modified: linux-kernel-headers/trunk/debian/generate-asm.sh
===================================================================
--- linux-kernel-headers/trunk/debian/generate-asm.sh 2006-06-10 22:36:17 UTC (rev 1650)
+++ linux-kernel-headers/trunk/debian/generate-asm.sh 2006-06-11 06:27:48 UTC (rev 1651)
@@ -25,17 +25,6 @@
arch_biarch="amd64"
asm_dir_out="asm-i486"
;;
- powerpc)
- define_biarch="#ifdef __powerpc64__"
- kernel_arch="powerpc"
- kernel_arch_biarch="powerpc"
- ;;
- ppc64)
- define_biarch="#ifndef __powerpc64__"
- kernel_arch="powerpc"
- kernel_arch_biarch="powerpc"
- arch_biarch="powerpc"
- ;;
sparc)
define_biarch="#ifdef __arch64__"
kernel_arch="sparc"
Added: linux-kernel-headers/trunk/debian/patches/asm-powerpc-unaligned.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/asm-powerpc-unaligned.patch 2006-06-10 22:36:17 UTC (rev 1650)
+++ linux-kernel-headers/trunk/debian/patches/asm-powerpc-unaligned.patch 2006-06-11 06:27:48 UTC (rev 1651)
@@ -0,0 +1,19 @@
+Index: linux-kernel-headers-2.6.16.20/include/asm-powerpc/unaligned.h
+===================================================================
+--- linux-kernel-headers-2.6.16.20.orig/include/asm-powerpc/unaligned.h 2006-06-11 02:16:08.000000000 -0400
++++ linux-kernel-headers-2.6.16.20/include/asm-powerpc/unaligned.h 2006-06-11 02:16:24.000000000 -0400
+@@ -1,8 +1,6 @@
+ #ifndef _ASM_POWERPC_UNALIGNED_H
+ #define _ASM_POWERPC_UNALIGNED_H
+
+-#ifdef __KERNEL__
+-
+ /*
+ * The PowerPC can do unaligned accesses itself in big endian mode.
+ *
+@@ -15,5 +13,4 @@
+
+ #define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
+
+-#endif /* __KERNEL__ */
+ #endif /* _ASM_POWERPC_UNALIGNED_H */
Modified: linux-kernel-headers/trunk/debian/patches/asm-types-long-long.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/asm-types-long-long.patch 2006-06-10 22:36:17 UTC (rev 1650)
+++ linux-kernel-headers/trunk/debian/patches/asm-types-long-long.patch 2006-06-11 06:27:48 UTC (rev 1651)
@@ -1,7 +1,7 @@
Index: include/asm-arm/types.h
===================================================================
---- include/asm-arm/types.h.orig 2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-arm/types.h 2006-06-09 23:48:20.780078204 -0400
+--- include/asm-arm/types.h.orig 2006-06-11 02:19:22.000000000 -0400
++++ include/asm-arm/types.h 2006-06-11 02:19:25.000000000 -0400
@@ -19,9 +19,9 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -17,8 +17,8 @@
#endif /* __ASSEMBLY__ */
Index: include/asm-i386/types.h
===================================================================
---- include/asm-i386/types.h.orig 2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-i386/types.h 2006-06-09 23:48:20.780078204 -0400
+--- include/asm-i386/types.h.orig 2006-06-11 02:19:22.000000000 -0400
++++ include/asm-i386/types.h 2006-06-11 02:19:25.000000000 -0400
@@ -19,9 +19,9 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -34,8 +34,8 @@
#endif /* __ASSEMBLY__ */
Index: include/asm-m32r/types.h
===================================================================
---- include/asm-m32r/types.h.orig 2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-m32r/types.h 2006-06-09 23:48:20.784078596 -0400
+--- include/asm-m32r/types.h.orig 2006-06-11 02:19:22.000000000 -0400
++++ include/asm-m32r/types.h 2006-06-11 02:19:25.000000000 -0400
@@ -23,9 +23,9 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -51,8 +51,8 @@
Index: include/asm-m68k/types.h
===================================================================
---- include/asm-m68k/types.h.orig 2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-m68k/types.h 2006-06-09 23:48:20.784078596 -0400
+--- include/asm-m68k/types.h.orig 2006-06-11 02:19:22.000000000 -0400
++++ include/asm-m68k/types.h 2006-06-11 02:19:25.000000000 -0400
@@ -27,9 +27,9 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -68,8 +68,8 @@
#endif /* __ASSEMBLY__ */
Index: include/asm-mips/types.h
===================================================================
---- include/asm-mips/types.h.orig 2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-mips/types.h 2006-06-09 23:48:20.784078596 -0400
+--- include/asm-mips/types.h.orig 2006-06-11 02:19:22.000000000 -0400
++++ include/asm-mips/types.h 2006-06-11 02:19:25.000000000 -0400
@@ -34,9 +34,9 @@
#else
@@ -85,8 +85,8 @@
#endif
Index: include/asm-parisc/types.h
===================================================================
---- include/asm-parisc/types.h.orig 2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-parisc/types.h 2006-06-09 23:48:20.784078596 -0400
+--- include/asm-parisc/types.h.orig 2006-06-11 02:19:22.000000000 -0400
++++ include/asm-parisc/types.h 2006-06-11 02:19:25.000000000 -0400
@@ -19,9 +19,9 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -102,8 +102,8 @@
#endif /* __ASSEMBLY__ */
Index: include/asm-sh/types.h
===================================================================
---- include/asm-sh/types.h.orig 2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-sh/types.h 2006-06-09 23:48:20.788078988 -0400
+--- include/asm-sh/types.h.orig 2006-06-11 02:19:22.000000000 -0400
++++ include/asm-sh/types.h 2006-06-11 02:19:25.000000000 -0400
@@ -19,9 +19,9 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -119,8 +119,8 @@
#endif /* __ASSEMBLY__ */
Index: include/asm-sparc/types.h
===================================================================
---- include/asm-sparc/types.h.orig 2006-06-09 23:44:40.074356872 -0400
-+++ include/asm-sparc/types.h 2006-06-09 23:48:20.788078988 -0400
+--- include/asm-sparc/types.h.orig 2006-06-11 02:19:25.000000000 -0400
++++ include/asm-sparc/types.h 2006-06-11 02:19:25.000000000 -0400
@@ -28,9 +28,9 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -136,8 +136,8 @@
#endif /* __ASSEMBLY__ */
Index: include/asm-x86_64/types.h
===================================================================
---- include/asm-x86_64/types.h.orig 2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-x86_64/types.h 2006-06-09 23:48:20.788078988 -0400
+--- include/asm-x86_64/types.h.orig 2006-06-11 02:19:22.000000000 -0400
++++ include/asm-x86_64/types.h 2006-06-11 02:19:25.000000000 -0400
@@ -19,8 +19,10 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -151,3 +151,20 @@
#endif /* __ASSEMBLY__ */
+Index: include/asm-powerpc/types.h
+===================================================================
+--- include/asm-powerpc/types.h.orig 2006-06-11 02:19:35.000000000 -0400
++++ include/asm-powerpc/types.h 2006-06-11 02:20:19.000000000 -0400
+@@ -40,9 +40,9 @@
+ typedef __signed__ long __s64;
+ typedef unsigned long __u64;
+ #else
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-typedef __signed__ long long __s64;
+-typedef unsigned long long __u64;
++#if defined(__GNUC__)
++__extension__ typedef __signed__ long long __s64;
++__extension__ typedef unsigned long long __u64;
+ #endif
+ #endif /* __powerpc64__ */
+
Modified: linux-kernel-headers/trunk/debian/patches/series
===================================================================
--- linux-kernel-headers/trunk/debian/patches/series 2006-06-10 22:36:17 UTC (rev 1650)
+++ linux-kernel-headers/trunk/debian/patches/series 2006-06-11 06:27:48 UTC (rev 1651)
@@ -31,3 +31,4 @@
spinlock.patch -p0
usb.patch -p0
videodev2-timeval.patch -p0
+asm-powerpc-unaligned.patch
Modified: linux-kernel-headers/trunk/debian/rules
===================================================================
--- linux-kernel-headers/trunk/debian/rules 2006-06-10 22:36:17 UTC (rev 1650)
+++ linux-kernel-headers/trunk/debian/rules 2006-06-11 06:27:48 UTC (rev 1651)
@@ -31,7 +31,7 @@
install -d $(includedir)
install -d $(includedir)/linux
-ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 i386 powerpc ppc64 sparc))
+ifneq (,$(findstring $(DEB_HOST_ARCH), amd64 i386 sparc))
sh debian/generate-asm.sh $(DEB_HOST_ARCH) include $(includedir) autoconfs
else
cp -a include/asm-$(kernel_arch) $(includedir)/asm
Reply to: