r907 - linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches
Author: gotom
Date: 2005-05-27 14:32:01 +0000 (Fri, 27 May 2005)
New Revision: 907
Added:
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/byteorder-inline.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/linux-fs-types.patch
Log:
added in 2.6.12+0rc5-1.
Added: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/byteorder-inline.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/byteorder-inline.patch 2005-05-27 14:31:06 UTC (rev 906)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/byteorder-inline.patch 2005-05-27 14:32:01 UTC (rev 907)
@@ -0,0 +1,139 @@
+2005-05-05 gotom, Add to use __inline__ instead of inline directly for -ansi.
+Don't define __cpu_to[lb]64p and __[lb]64_to_cpup under __STRICT_ANSI__.
+
+--- include.orig/linux/byteorder/little_endian.h 2005-04-21 09:03:16.000000000 +0900
++++ include/linux/byteorder/little_endian.h 2005-05-05 20:11:10.183350481 +0900
+@@ -40,51 +40,53 @@
+ #define __cpu_to_be16(x) ((__force __be16)__swab16((x)))
+ #define __be16_to_cpu(x) __swab16((__force __u16)(__be16)(x))
+
+-static inline __le64 __cpu_to_le64p(const __u64 *p)
++static __inline__ __le64 __cpu_to_le64p(const __u64 *p)
+ {
+ return (__force __le64)*p;
+ }
+-static inline __u64 __le64_to_cpup(const __le64 *p)
++static __inline__ __u64 __le64_to_cpup(const __le64 *p)
+ {
+ return (__force __u64)*p;
+ }
+-static inline __le32 __cpu_to_le32p(const __u32 *p)
++static __inline__ __le32 __cpu_to_le32p(const __u32 *p)
+ {
+ return (__force __le32)*p;
+ }
+-static inline __u32 __le32_to_cpup(const __le32 *p)
++static __inline__ __u32 __le32_to_cpup(const __le32 *p)
+ {
+ return (__force __u32)*p;
+ }
+-static inline __le16 __cpu_to_le16p(const __u16 *p)
++static __inline__ __le16 __cpu_to_le16p(const __u16 *p)
+ {
+ return (__force __le16)*p;
+ }
+-static inline __u16 __le16_to_cpup(const __le16 *p)
++static __inline__ __u16 __le16_to_cpup(const __le16 *p)
+ {
+ return (__force __u16)*p;
+ }
+-static inline __be64 __cpu_to_be64p(const __u64 *p)
++#if !defined(__STRICT_ANSI__)
++static __inline__ __be64 __cpu_to_be64p(const __u64 *p)
+ {
+ return (__force __be64)__swab64p(p);
+ }
+-static inline __u64 __be64_to_cpup(const __be64 *p)
++static __inline__ __u64 __be64_to_cpup(const __be64 *p)
+ {
+ return __swab64p((__u64 *)p);
+ }
+-static inline __be32 __cpu_to_be32p(const __u32 *p)
++#endif
++static __inline__ __be32 __cpu_to_be32p(const __u32 *p)
+ {
+ return (__force __be32)__swab32p(p);
+ }
+-static inline __u32 __be32_to_cpup(const __be32 *p)
++static __inline__ __u32 __be32_to_cpup(const __be32 *p)
+ {
+ return __swab32p((__u32 *)p);
+ }
+-static inline __be16 __cpu_to_be16p(const __u16 *p)
++static __inline__ __be16 __cpu_to_be16p(const __u16 *p)
+ {
+ return (__force __be16)__swab16p(p);
+ }
+-static inline __u16 __be16_to_cpup(const __be16 *p)
++static __inline__ __u16 __be16_to_cpup(const __be16 *p)
+ {
+ return __swab16p((__u16 *)p);
+ }
+--- include.orig/linux/byteorder/big_endian.h 2005-04-21 09:03:16.000000000 +0900
++++ include/linux/byteorder/big_endian.h 2005-05-05 20:15:32.041497892 +0900
+@@ -40,51 +40,53 @@
+ #define __cpu_to_be16(x) ((__force __be16)(__u16)(x))
+ #define __be16_to_cpu(x) ((__force __u16)(__be16)(x))
+
+-static inline __le64 __cpu_to_le64p(const __u64 *p)
++static __inline__ __le64 __cpu_to_le64p(const __u64 *p)
+ {
+ return (__force __le64)__swab64p(p);
+ }
+-static inline __u64 __le64_to_cpup(const __le64 *p)
++static __inline__ __u64 __le64_to_cpup(const __le64 *p)
+ {
+ return __swab64p((__u64 *)p);
+ }
+-static inline __le32 __cpu_to_le32p(const __u32 *p)
++static __inline__ __le32 __cpu_to_le32p(const __u32 *p)
+ {
+ return (__force __le32)__swab32p(p);
+ }
+-static inline __u32 __le32_to_cpup(const __le32 *p)
++static __inline__ __u32 __le32_to_cpup(const __le32 *p)
+ {
+ return __swab32p((__u32 *)p);
+ }
+-static inline __le16 __cpu_to_le16p(const __u16 *p)
++static __inline__ __le16 __cpu_to_le16p(const __u16 *p)
+ {
+ return (__force __le16)__swab16p(p);
+ }
+-static inline __u16 __le16_to_cpup(const __le16 *p)
++static __inline__ __u16 __le16_to_cpup(const __le16 *p)
+ {
+ return __swab16p((__u16 *)p);
+ }
+-static inline __be64 __cpu_to_be64p(const __u64 *p)
++#if !defined(__STRICT_ANSI__)
++static __inline__ __be64 __cpu_to_be64p(const __u64 *p)
+ {
+ return (__force __be64)*p;
+ }
+-static inline __u64 __be64_to_cpup(const __be64 *p)
++static __inline__ __u64 __be64_to_cpup(const __be64 *p)
+ {
+ return (__force __u64)*p;
+ }
+-static inline __be32 __cpu_to_be32p(const __u32 *p)
++#endif
++static __inline__ __be32 __cpu_to_be32p(const __u32 *p)
+ {
+ return (__force __be32)*p;
+ }
+-static inline __u32 __be32_to_cpup(const __be32 *p)
++static __inline__ __u32 __be32_to_cpup(const __be32 *p)
+ {
+ return (__force __u32)*p;
+ }
+-static inline __be16 __cpu_to_be16p(const __u16 *p)
++static __inline__ __be16 __cpu_to_be16p(const __u16 *p)
+ {
+ return (__force __be16)*p;
+ }
+-static inline __u16 __be16_to_cpup(const __be16 *p)
++static __inline__ __u16 __be16_to_cpup(const __be16 *p)
+ {
+ return (__force __u16)*p;
+ }
Added: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/linux-fs-types.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/linux-fs-types.patch 2005-05-27 14:31:06 UTC (rev 906)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/linux-fs-types.patch 2005-05-27 14:32:01 UTC (rev 907)
@@ -0,0 +1,14 @@
+Include linux/types.h out of __KERNEL__ so that lkh linux/types.h
+has special hack for passing non __KERNEL__ part.
+This patch fixes testsuite/fs.c test.
+
+--- ../include.orig/linux/fs.h 2005-04-21 09:03:16.000000000 +0900
++++ include/linux/fs.h 2005-05-05 17:06:11.546297175 +0900
+@@ -9,6 +9,7 @@
+ #include <linux/config.h>
+ #include <linux/limits.h>
+ #include <linux/ioctl.h>
++#include <linux/types.h>
+
+ /*
+ * It's silly to have NR_OPEN bigger than NR_FILE, but you can change
Reply to: