r926 - in linux-kernel-headers/branches/lkh-branch-2.6.12/debian: . patches
Author: gotom
Date: 2005-06-12 15:59:43 +0000 (Sun, 12 Jun 2005)
New Revision: 926
Added:
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/asm-ppc64-swab64.patch
Modified:
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/changelog
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/byteorder-const.patch
Log:
- debian/patches/asm-ppc64-swab64.patch: Add to enable
__arch__swab{16,32}, disable __arch__swab64 on ppc64.
- debian/patches/byteorder-const.patch: Move asm-ppc64 part to
asm-ppc64-swab64.patch.
Modified: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/changelog
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/changelog 2005-06-12 15:49:05 UTC (rev 925)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/changelog 2005-06-12 15:59:43 UTC (rev 926)
@@ -12,6 +12,11 @@
friendly for asm-parisc/unistd.h. It's already fixed in the latest
cvs.parisc-linux.org. (Closes: #301073)
+ - debian/patches/asm-ppc64-swab64.patch: Add to enable
+ __arch__swab{16,32}, disable __arch__swab64 on ppc64.
+ - debian/patches/byteorder-const.patch: Move asm-ppc64 part to
+ asm-ppc64-swab64.patch.
+
- debian/patches/ioctl-typecheck.patch: Add to make impotent _IOC_TYPECHECK
checking macro for userland, to fix incompatible ioctl number in switch
case statement with g++ 3.4 and later. Proposed patch by Jeremy
Added: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/asm-ppc64-swab64.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/asm-ppc64-swab64.patch 2005-06-12 15:49:05 UTC (rev 925)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/asm-ppc64-swab64.patch 2005-06-12 15:59:43 UTC (rev 926)
@@ -0,0 +1,46 @@
+2005-06-11 GOTO Masanori <gotom@debian.org>
+
+ Enable ___arch__swab16, ___arch__swab32.
+ Remove ___arch__swab64 because ppc64 does not have appropriate
+ instruction for this purpose.
+ Move byteorder-const.h ppc64 part to this file.
+
+--- ../linux-2.6.12-rc6/include/asm-ppc64/byteorder.h 2005-06-07 00:22:29.000000000 +0900
++++ include/asm-ppc64/byteorder.h 2005-06-13 00:57:52.150659216 +0900
+@@ -40,8 +40,7 @@
+ __asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr));
+ }
+
+-#if 0
+-static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 value)
++static __inline__ __u16 ___arch__swab16(__u16 value)
+ {
+ __u16 result;
+
+@@ -51,7 +50,7 @@
+ return result;
+ }
+
+-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 value)
++static __inline__ __u32 ___arch__swab32(__u32 value)
+ {
+ __u32 result;
+
+@@ -63,17 +62,8 @@
+ return result;
+ }
+
+-static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 value)
+-{
+- __u64 result;
+-#error implement me
+-}
+-
+ #define __arch__swab16(x) ___arch__swab16(x)
+ #define __arch__swab32(x) ___arch__swab32(x)
+-#define __arch__swab64(x) ___arch__swab64(x)
+-
+-#endif
+
+ /* The same, but returns converted value from the location pointer by addr. */
+ #define __arch__swab16p(addr) ld_le16(addr)
Modified: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/byteorder-const.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/byteorder-const.patch 2005-06-12 15:49:05 UTC (rev 925)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/byteorder-const.patch 2005-06-12 15:59:43 UTC (rev 926)
@@ -1,4 +1,5 @@
Update 2005-05-27 gotom.
+Disable asm-ppc64/byteorder.h patch, move it to asm-ppc64-swab64.h
--- include.orig/asm-alpha/byteorder.h 2005-04-21 09:03:16.000000000 +0900
+++ include/asm-alpha/byteorder.h 2005-05-27 21:39:42.537551683 +0900
@@ -108,35 +109,35 @@
{
__u32 result;
---- include.orig/asm-ppc64/byteorder.h 2005-04-21 09:03:16.000000000 +0900
-+++ include/asm-ppc64/byteorder.h 2005-05-27 21:44:08.589474205 +0900
-@@ -41,7 +41,7 @@
- }
-
- #if 0
--static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 value)
-+static __inline__ __u16 ___arch__swab16(__u16 value)
- {
- __u16 result;
-
-@@ -51,7 +51,7 @@
- return result;
- }
-
--static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 value)
-+static __inline__ __u32 ___arch__swab32(__u32 value)
- {
- __u32 result;
-
-@@ -63,7 +63,7 @@
- return result;
- }
-
--static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 value)
-+static __inline__ __u64 ___arch__swab64(__u64 value)
- {
- __u64 result;
- #error implement me
+#--- include.orig/asm-ppc64/byteorder.h 2005-04-21 09:03:16.000000000 +0900
+#+++ include/asm-ppc64/byteorder.h 2005-05-27 21:44:08.589474205 +0900
+#@@ -41,7 +41,7 @@
+# }
+#
+# #if 0
+#-static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 value)
+#+static __inline__ __u16 ___arch__swab16(__u16 value)
+# {
+# __u16 result;
+#
+#@@ -51,7 +51,7 @@
+# return result;
+# }
+#
+#-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 value)
+#+static __inline__ __u32 ___arch__swab32(__u32 value)
+# {
+# __u32 result;
+#
+#@@ -63,7 +63,7 @@
+# return result;
+# }
+#
+#-static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 value)
+#+static __inline__ __u64 ___arch__swab64(__u64 value)
+# {
+# __u64 result;
+# #error implement me
--- include.orig/asm-sh/byteorder.h 2005-04-21 09:03:16.000000000 +0900
+++ include/asm-sh/byteorder.h 2005-05-27 21:44:57.552894641 +0900
@@ -8,7 +8,7 @@
Reply to: