Author: schizo
Date: 2006-06-10 19:22:14 +0000 (Sat, 10 Jun 2006)
New Revision: 1647
Modified:
linux-kernel-headers/trunk/debian/changelog
linux-kernel-headers/trunk/debian/generate-asm.sh
linux-kernel-headers/trunk/debian/patches/byteorder-const.patch
Log:
* Fix byteorder-const.patch on arm.
* debian/generate-asm.sh: take a random stab at coping
with the asm-powerpc change.
Modified: linux-kernel-headers/trunk/debian/changelog
===================================================================
--- linux-kernel-headers/trunk/debian/changelog 2006-06-10 05:39:33 UTC (rev
1646)
+++ linux-kernel-headers/trunk/debian/changelog 2006-06-10 19:22:14 UTC (rev
1647)
@@ -1,3 +1,11 @@
+linux-kernel-headers (2.6.16.20-2) unstable; urgency=low
+
+ * Fix byteorder-const.patch on arm.
+ * debian/generate-asm.sh: take a random stab at coping
+ with the asm-powerpc change.
+
+ -- Clint Adams <[EMAIL PROTECTED]> Sat, 10 Jun 2006 15:13:52 -0400
+
linux-kernel-headers (2.6.16.20-1) unstable; urgency=low
* New upstream release 2.6.16.20.
Modified: linux-kernel-headers/trunk/debian/generate-asm.sh
===================================================================
--- linux-kernel-headers/trunk/debian/generate-asm.sh 2006-06-10 05:39:33 UTC
(rev 1646)
+++ linux-kernel-headers/trunk/debian/generate-asm.sh 2006-06-10 19:22:14 UTC
(rev 1647)
@@ -27,13 +27,13 @@
;;
powerpc)
define_biarch="#ifdef __powerpc64__"
- kernel_arch="ppc"
- kernel_arch_biarch="ppc64"
+ kernel_arch="powerpc"
+ kernel_arch_biarch="powerpc"
;;
ppc64)
define_biarch="#ifndef __powerpc64__"
- kernel_arch="ppc64"
- kernel_arch_biarch="ppc"
+ kernel_arch="powerpc"
+ kernel_arch_biarch="powerpc"
arch_biarch="powerpc"
;;
sparc)
Modified: linux-kernel-headers/trunk/debian/patches/byteorder-const.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/byteorder-const.patch
2006-06-10 05:39:33 UTC (rev 1646)
+++ linux-kernel-headers/trunk/debian/patches/byteorder-const.patch
2006-06-10 19:22:14 UTC (rev 1647)
@@ -8,7 +8,7 @@
Index: include/asm-alpha/byteorder.h
===================================================================
--- include/asm-alpha/byteorder.h.orig 2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-alpha/byteorder.h 2006-06-09 23:54:45.293810468 -0400
++++ include/asm-alpha/byteorder.h 2006-06-10 15:12:45.875830675 -0400
@@ -7,7 +7,7 @@
#ifdef __GNUC__
@@ -21,7 +21,7 @@
Index: include/asm-m68k/byteorder.h
===================================================================
--- include/asm-m68k/byteorder.h.orig 2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-m68k/byteorder.h 2006-06-09 23:54:45.293810468 -0400
++++ include/asm-m68k/byteorder.h 2006-06-10 15:12:45.875830675 -0400
@@ -6,7 +6,7 @@
#ifdef __GNUC__
@@ -34,7 +34,7 @@
Index: include/asm-parisc/byteorder.h
===================================================================
--- include/asm-parisc/byteorder.h.orig 2006-06-05 13:18:23.000000000
-0400
-+++ include/asm-parisc/byteorder.h 2006-06-09 23:54:45.293810468 -0400
++++ include/asm-parisc/byteorder.h 2006-06-10 15:12:45.879831073 -0400
@@ -6,7 +6,7 @@
#ifdef __GNUC__
@@ -83,7 +83,7 @@
Index: include/asm-sh/byteorder.h
===================================================================
--- include/asm-sh/byteorder.h.orig 2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-sh/byteorder.h 2006-06-09 23:54:45.297810861 -0400
++++ include/asm-sh/byteorder.h 2006-06-10 15:12:45.879831073 -0400
@@ -8,7 +8,7 @@
#include <asm/types.h>
#include <linux/compiler.h>
@@ -105,7 +105,7 @@
Index: include/asm-sh64/byteorder.h
===================================================================
--- include/asm-sh64/byteorder.h.orig 2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-sh64/byteorder.h 2006-06-09 23:54:45.297810861 -0400
++++ include/asm-sh64/byteorder.h 2006-06-10 15:12:45.879831073 -0400
@@ -14,7 +14,7 @@
#include <asm/types.h>
@@ -127,7 +127,7 @@
Index: include/asm-v850/byteorder.h
===================================================================
--- include/asm-v850/byteorder.h.orig 2006-06-05 13:18:23.000000000 -0400
-+++ include/asm-v850/byteorder.h 2006-06-09 23:54:45.297810861 -0400
++++ include/asm-v850/byteorder.h 2006-06-10 15:12:45.879831073 -0400
@@ -19,14 +19,14 @@
#ifdef __GNUC__
@@ -148,7 +148,7 @@
Index: include/asm-x86_64/byteorder.h
===================================================================
--- include/asm-x86_64/byteorder.h.orig 2006-06-05 13:18:23.000000000
-0400
-+++ include/asm-x86_64/byteorder.h 2006-06-09 23:54:45.297810861 -0400
++++ include/asm-x86_64/byteorder.h 2006-06-10 15:12:45.883831471 -0400
@@ -6,13 +6,13 @@
#ifdef __GNUC__
@@ -167,8 +167,8 @@
return x;
Index: include/linux/byteorder/swab.h
===================================================================
---- include/linux/byteorder/swab.h.orig 2006-06-09 23:29:46.406222718
-0400
-+++ include/linux/byteorder/swab.h 2006-06-09 23:54:45.301811254 -0400
+--- include/linux/byteorder/swab.h.orig 2006-06-10 15:12:45.531796435
-0400
++++ include/linux/byteorder/swab.h 2006-06-10 15:12:45.883831471 -0400
@@ -130,7 +130,7 @@
#endif /* OPTIMIZE */
@@ -198,8 +198,8 @@
__u32 h = x >> 32;
Index: include/asm-cris/arch-v10/byteorder.h
===================================================================
---- include/asm-cris/arch-v10/byteorder.h.orig 2006-06-09 23:56:01.000000000
-0400
-+++ include/asm-cris/arch-v10/byteorder.h 2006-06-09 23:56:16.718796074
-0400
+--- include/asm-cris/arch-v10/byteorder.h.orig 2006-06-05 13:18:23.000000000
-0400
++++ include/asm-cris/arch-v10/byteorder.h 2006-06-10 15:12:45.883831471
-0400
@@ -9,14 +9,14 @@
* them together into ntohl etc.
*/
@@ -219,8 +219,8 @@
Index: include/asm-powerpc/byteorder.h
===================================================================
---- include/asm-powerpc/byteorder.h.orig 2006-06-09 23:54:57.000000000
-0400
-+++ include/asm-powerpc/byteorder.h 2006-06-09 23:55:52.172383044 -0400
+--- include/asm-powerpc/byteorder.h.orig 2006-06-05 13:18:23.000000000
-0400
++++ include/asm-powerpc/byteorder.h 2006-06-10 15:12:45.883831471 -0400
@@ -40,7 +40,7 @@
__asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r"
(addr));
}
@@ -239,3 +239,16 @@
{
__u32 result;
+Index: include/asm-arm/byteorder.h
+===================================================================
+--- include/asm-arm/byteorder.h.orig 2006-06-10 15:13:11.000000000 -0400
++++ include/asm-arm/byteorder.h 2006-06-10 15:13:35.468767665 -0400
+@@ -18,7 +18,7 @@
+ #include <linux/compiler.h>
+ #include <asm/types.h>
+
+-static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
++static inline __u32 ___arch__swab32(__u32 x)
+ {
+ __u32 t;
+
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
