r1842 - in linux-kernel-headers/trunk/debian: . patches
Author: schizo
Date: 2006-10-07 13:20:54 +0000 (Sat, 07 Oct 2006)
New Revision: 1842
Modified:
linux-kernel-headers/trunk/debian/changelog
linux-kernel-headers/trunk/debian/patches/byteorder-const.patch
Log:
* Update byteorder-const.patch with patch from Wookey,
fixing arm FTBFS. closes: #391305.
Modified: linux-kernel-headers/trunk/debian/changelog
===================================================================
--- linux-kernel-headers/trunk/debian/changelog 2006-10-05 15:21:27 UTC (rev 1841)
+++ linux-kernel-headers/trunk/debian/changelog 2006-10-07 13:20:54 UTC (rev 1842)
@@ -1,3 +1,10 @@
+linux-kernel-headers (2.6.18-2) unstable; urgency=high
+
+ * Update byteorder-const.patch with patch from Wookey,
+ fixing arm FTBFS. closes: #391305.
+
+ -- Clint Adams <schizo@debian.org> Sat, 7 Oct 2006 08:59:27 -0400
+
linux-kernel-headers (2.6.18-1) unstable; urgency=low
* New upstream release 2.6.18.
Modified: linux-kernel-headers/trunk/debian/patches/byteorder-const.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/byteorder-const.patch 2006-10-05 15:21:27 UTC (rev 1841)
+++ linux-kernel-headers/trunk/debian/patches/byteorder-const.patch 2006-10-07 13:20:54 UTC (rev 1842)
@@ -7,8 +7,8 @@
Index: include/asm-alpha/byteorder.h
===================================================================
---- include/asm-alpha/byteorder.h.orig 2006-06-18 18:12:19.000000000 -0400
-+++ include/asm-alpha/byteorder.h 2006-06-18 18:12:22.030490840 -0400
+--- include/asm-alpha/byteorder.h.orig 2006-09-19 23:42:06.000000000 -0400
++++ include/asm-alpha/byteorder.h 2006-10-07 09:02:17.366543291 -0400
@@ -7,7 +7,7 @@
#ifdef __GNUC__
@@ -20,8 +20,8 @@
* Unfortunately, we can't use the 6 instruction sequence
Index: include/asm-m68k/byteorder.h
===================================================================
---- include/asm-m68k/byteorder.h.orig 2006-06-18 18:12:19.000000000 -0400
-+++ include/asm-m68k/byteorder.h 2006-06-18 18:12:22.030490840 -0400
+--- include/asm-m68k/byteorder.h.orig 2006-09-19 23:42:06.000000000 -0400
++++ include/asm-m68k/byteorder.h 2006-10-07 09:02:17.370543699 -0400
@@ -6,7 +6,7 @@
#ifdef __GNUC__
@@ -33,8 +33,8 @@
return val;
Index: include/asm-parisc/byteorder.h
===================================================================
---- include/asm-parisc/byteorder.h.orig 2006-06-18 18:12:18.000000000 -0400
-+++ include/asm-parisc/byteorder.h 2006-06-18 18:12:22.030490840 -0400
+--- include/asm-parisc/byteorder.h.orig 2006-09-19 23:42:06.000000000 -0400
++++ include/asm-parisc/byteorder.h 2006-10-07 09:02:17.370543699 -0400
@@ -6,7 +6,7 @@
#ifdef __GNUC__
@@ -82,8 +82,8 @@
__u32 t2 = ___arch__swab32((__u32) (x >> 32));
Index: include/asm-sh/byteorder.h
===================================================================
---- include/asm-sh/byteorder.h.orig 2006-06-18 18:12:18.000000000 -0400
-+++ include/asm-sh/byteorder.h 2006-06-18 18:12:22.034491317 -0400
+--- include/asm-sh/byteorder.h.orig 2006-09-19 23:42:06.000000000 -0400
++++ include/asm-sh/byteorder.h 2006-10-07 09:02:17.370543699 -0400
@@ -8,7 +8,7 @@
#include <asm/types.h>
#include <linux/compiler.h>
@@ -104,8 +104,8 @@
: "=r" (x)
Index: include/asm-v850/byteorder.h
===================================================================
---- include/asm-v850/byteorder.h.orig 2006-06-18 18:12:18.000000000 -0400
-+++ include/asm-v850/byteorder.h 2006-06-18 18:12:22.034491317 -0400
+--- include/asm-v850/byteorder.h.orig 2006-09-19 23:42:06.000000000 -0400
++++ include/asm-v850/byteorder.h 2006-10-07 09:02:17.374544106 -0400
@@ -19,14 +19,14 @@
#ifdef __GNUC__
@@ -125,8 +125,8 @@
__asm__ ("bsh %1, %0" : "=r" (res) : "r" (half_word));
Index: include/asm-x86_64/byteorder.h
===================================================================
---- include/asm-x86_64/byteorder.h.orig 2006-06-18 18:12:18.000000000 -0400
-+++ include/asm-x86_64/byteorder.h 2006-06-18 18:12:22.034491317 -0400
+--- include/asm-x86_64/byteorder.h.orig 2006-09-19 23:42:06.000000000 -0400
++++ include/asm-x86_64/byteorder.h 2006-10-07 09:02:17.374544106 -0400
@@ -6,13 +6,13 @@
#ifdef __GNUC__
@@ -145,8 +145,8 @@
return x;
Index: include/linux/byteorder/swab.h
===================================================================
---- include/linux/byteorder/swab.h.orig 2006-06-18 18:12:21.678448870 -0400
-+++ include/linux/byteorder/swab.h 2006-06-18 18:12:22.038491794 -0400
+--- include/linux/byteorder/swab.h.orig 2006-10-07 09:02:17.062512303 -0400
++++ include/linux/byteorder/swab.h 2006-10-07 09:02:17.374544106 -0400
@@ -130,7 +130,7 @@
#endif /* OPTIMIZE */
@@ -176,8 +176,8 @@
__u32 h = x >> 32;
Index: include/asm-cris/arch-v10/byteorder.h
===================================================================
---- include/asm-cris/arch-v10/byteorder.h.orig 2006-06-18 18:12:18.000000000 -0400
-+++ include/asm-cris/arch-v10/byteorder.h 2006-06-18 18:12:22.038491794 -0400
+--- include/asm-cris/arch-v10/byteorder.h.orig 2006-09-19 23:42:06.000000000 -0400
++++ include/asm-cris/arch-v10/byteorder.h 2006-10-07 09:02:17.378544514 -0400
@@ -9,14 +9,14 @@
* them together into ntohl etc.
*/
@@ -197,8 +197,8 @@
Index: include/asm-powerpc/byteorder.h
===================================================================
---- include/asm-powerpc/byteorder.h.orig 2006-06-18 18:12:18.000000000 -0400
-+++ include/asm-powerpc/byteorder.h 2006-06-18 18:12:22.038491794 -0400
+--- include/asm-powerpc/byteorder.h.orig 2006-09-19 23:42:06.000000000 -0400
++++ include/asm-powerpc/byteorder.h 2006-10-07 09:02:17.378544514 -0400
@@ -40,7 +40,7 @@
__asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr));
}
@@ -217,3 +217,25 @@
{
__u32 result;
+Index: include/asm-arm/byteorder.h
+===================================================================
+--- include/asm-arm/byteorder.h.orig 2006-10-07 09:02:59.286816053 -0400
++++ include/asm-arm/byteorder.h 2006-10-07 09:03:19.256851602 -0400
+@@ -18,7 +18,7 @@
+ #include <linux/compiler.h>
+ #include <asm/types.h>
+
+-static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
++static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+ {
+ __u32 t;
+
+@@ -29,7 +29,7 @@
+ * right thing and not screw it up to different degrees
+ * depending on the gcc version.
+ */
+- asm ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x));
++ __asm__ ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x));
+ } else
+ #endif
+ t = x ^ ((x << 16) | (x >> 16)); /* eor r1,r0,r0,ror #16 */
Reply to: