r908 - linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches
Author: gotom
Date: 2005-05-27 14:33:32 +0000 (Fri, 27 May 2005)
New Revision: 908
Modified:
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/alpha-ansi.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/asm-i386-byteorder-u64.patch
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/linux-netlink-compilation.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/linux-types-and-time.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/mips-ansi-fixes.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/no-linux-compiler-h.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/usb.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/videodev2-timeval.patch
linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/x86-64-long-long.patch
Log:
updated in 2.6.12+0rc5-1.
Modified: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/alpha-ansi.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/alpha-ansi.patch 2005-05-27 14:32:01 UTC (rev 907)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/alpha-ansi.patch 2005-05-27 14:33:32 UTC (rev 908)
@@ -1,3 +1,5 @@
+Update 2005-05-05 gotom, move linux/byteorder/swab.h part to byteorder.patch.
+
--- include/linux/byteorder/swab.h 2004-01-03 13:53:25.000000000 -0500
+++ include/linux/byteorder/swab.h 2004-01-04 18:01:22.000000000 -0500
@@ -154,6 +154,7 @@
Modified: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/asm-i386-byteorder-u64.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/asm-i386-byteorder-u64.patch 2005-05-27 14:32:01 UTC (rev 907)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/asm-i386-byteorder-u64.patch 2005-05-27 14:33:32 UTC (rev 908)
@@ -2,28 +2,31 @@
order to use <linux/cdrom.h> in this mode we need to fix this file not to
assume __u64.
---- include/asm-i386/byteorder.h.orig 2003-10-15 11:13:06.000000000 -0400
-+++ include/asm-i386/byteorder.h 2003-11-01 17:33:12.000000000 -0500
-@@ -34,6 +34,10 @@
- return x;
+Update 2005-05-04 - gotom.
+
+--- include.orig/asm-i386/byteorder.h 2005-04-21 09:03:16.000000000 +0900
++++ include/asm-i386/byteorder.h 2005-05-03 14:25:46.000000000 +0900
+@@ -25,6 +25,10 @@
+ return x;
}
+#define __arch__swab32(x) ___arch__swab32(x)
-+#define __arch__swab16(x) ___arch__swab16(x)
+
+#if !defined (__STRICT_ANSI__)
-
- static inline __u64 ___arch__swab64(__u64 val)
++
+ static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 val)
{
-@@ -55,10 +59,9 @@
- }
+ union {
+@@ -48,10 +52,11 @@ static __inline__ __attribute_const__ __
+ convert it into rotation or exhange. */
#define __arch__swab64(x) ___arch__swab64(x)
-#define __arch__swab32(x) ___arch__swab32(x)
--#define __arch__swab16(x) ___arch__swab16(x)
#define __BYTEORDER_HAS_U64__
-+#endif
++#endif /* !__STRICT_ANSI__ */
++
#endif /* __GNUC__ */
+ #include <linux/byteorder/little_endian.h>
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-05-27 14:32:01 UTC (rev 907)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/byteorder-const.patch 2005-05-27 14:33:32 UTC (rev 908)
@@ -1,11 +1,23 @@
-diff -urp include.orig/asm-cris/arch-v10/byteorder.h include/asm-cris/arch-v10/byteorder.h
---- include.orig/asm-cris/arch-v10/byteorder.h 2003-10-15 11:13:31.000000000 -0400
-+++ include/asm-cris/arch-v10/byteorder.h 2003-11-21 19:27:07.000000000 -0500
-@@ -8,14 +8,14 @@
+Update 2005-05-27 gotom.
+
+--- 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
+@@ -7,7 +7,7 @@
+
+ #ifdef __GNUC__
+
+-static __inline __attribute_const__ __u32 __arch__swab32(__u32 x)
++static __inline __u32 __arch__swab32(__u32 x)
+ {
+ /*
+ * Unfortunately, we can't use the 6 instruction sequence
+--- include.orig/asm-cris/arch-v10/byteorder.h 2005-04-21 09:03:16.000000000 +0900
++++ include/asm-cris/arch-v10/byteorder.h 2005-05-27 21:40:50.951268236 +0900
+@@ -9,14 +9,14 @@
* them together into ntohl etc.
*/
--extern __inline__ __const__ __u32 ___arch__swab32(__u32 x)
+-extern __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+extern __inline__ __u32 ___arch__swab32(__u32 x)
{
__asm__ ("swapwb %0" : "=r" (x) : "0" (x));
@@ -13,257 +25,165 @@
return(x);
}
--extern __inline__ __const__ __u16 ___arch__swab16(__u16 x)
+-extern __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
+extern __inline__ __u16 ___arch__swab16(__u16 x)
{
__asm__ ("swapb %0" : "=r" (x) : "0" (x));
-diff -urp include.orig/asm-i386/byteorder.h include/asm-i386/byteorder.h
---- include.orig/asm-i386/byteorder.h 2003-11-21 19:19:48.000000000 -0500
-+++ include/asm-i386/byteorder.h 2003-11-21 19:27:07.000000000 -0500
-@@ -10,7 +10,7 @@
- #include <linux/config.h>
- #endif
+--- include.orig/asm-m68k/byteorder.h 2005-04-21 09:03:16.000000000 +0900
++++ include/asm-m68k/byteorder.h 2005-05-27 21:42:28.255064498 +0900
+@@ -6,7 +6,7 @@
--static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
-+static __inline__ __u32 ___arch__swab32(__u32 x)
- {
- #ifdef CONFIG_X86_BSWAP
- __asm__("bswap %0" : "=r" (x) : "0" (x));
-@@ -26,7 +26,7 @@ static __inline__ __const__ __u32 ___arc
-
- /* gcc should generate this for open coded C now too. May be worth switching to
- it because inline assembly cannot be scheduled. -AK */
--static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
-+static __inline__ __u16 ___arch__swab16(__u16 x)
- {
- __asm__("xchgb %b0,%h0" /* swap bytes */
- : "=q" (x)
-diff -urp include.orig/asm-ia64/byteorder.h include/asm-ia64/byteorder.h
---- include.orig/asm-ia64/byteorder.h 2003-10-15 11:10:25.000000000 -0400
-+++ include/asm-ia64/byteorder.h 2003-11-21 19:27:07.000000000 -0500
-@@ -9,7 +9,7 @@
- #include <asm/types.h>
- #include <asm/intrinsics.h>
-
--static __inline__ __const__ __u64
-+static __inline__ __u64
- __ia64_swab64 (__u64 x)
- {
- __u64 result;
-@@ -18,13 +18,13 @@ __ia64_swab64 (__u64 x)
- return result;
- }
-
--static __inline__ __const__ __u32
-+static __inline__ __u32
- __ia64_swab32 (__u32 x)
- {
- return __ia64_swab64(x) >> 32;
- }
-
--static __inline__ __const__ __u16
-+static __inline__ __u16
- __ia64_swab16(__u16 x)
- {
- return __ia64_swab64(x) >> 48;
-diff -urp include.orig/asm-m68k/byteorder.h include/asm-m68k/byteorder.h
---- include.orig/asm-m68k/byteorder.h 2003-10-15 11:12:08.000000000 -0400
-+++ include/asm-m68k/byteorder.h 2003-11-21 19:27:07.000000000 -0500
-@@ -5,7 +5,7 @@
-
#ifdef __GNUC__
--static __inline__ __const__ __u32 ___arch__swab32(__u32 val)
+-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 val)
+static __inline__ __u32 ___arch__swab32(__u32 val)
{
__asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val));
return val;
-diff -urp include.orig/asm-parisc/byteorder.h include/asm-parisc/byteorder.h
---- include.orig/asm-parisc/byteorder.h 2003-10-15 11:14:12.000000000 -0400
-+++ include/asm-parisc/byteorder.h 2003-11-21 19:27:07.000000000 -0500
-@@ -5,7 +5,7 @@
+--- include.orig/asm-parisc/byteorder.h 2005-04-21 09:03:16.000000000 +0900
++++ include/asm-parisc/byteorder.h 2005-05-27 21:43:25.651276042 +0900
+@@ -6,7 +6,7 @@
#ifdef __GNUC__
--static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
+-static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
+static __inline__ __u16 ___arch__swab16(__u16 x)
{
__asm__("dep %0, 15, 8, %0\n\t" /* deposit 00ab -> 0bab */
"shd %%r0, %0, 8, %0" /* shift 000000ab -> 00ba */
-@@ -14,7 +14,7 @@ static __inline__ __const__ __u16 ___arc
+@@ -15,7 +15,7 @@
return x;
}
--static __inline__ __const__ __u32 ___arch__swab24(__u32 x)
+-static __inline__ __attribute_const__ __u32 ___arch__swab24(__u32 x)
+static __inline__ __u32 ___arch__swab24(__u32 x)
{
__asm__("shd %0, %0, 8, %0\n\t" /* shift xabcxabc -> cxab */
"dep %0, 15, 8, %0\n\t" /* deposit cxab -> cbab */
-@@ -24,7 +24,7 @@ static __inline__ __const__ __u32 ___arc
+@@ -25,7 +25,7 @@
return x;
}
--static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
+-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+static __inline__ __u32 ___arch__swab32(__u32 x)
{
unsigned int temp;
__asm__("shd %0, %0, 16, %1\n\t" /* shift abcdabcd -> cdab */
-@@ -47,7 +47,7 @@ static __inline__ __const__ __u32 ___arc
+@@ -48,7 +48,7 @@
** HSHR 67452301 -> *6*4*2*0 into %0
** OR %0 | %1 -> 76543210 into %0 (all done!)
*/
--static __inline__ __const__ __u64 ___arch__swab64(__u64 x) {
+-static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x) {
+static __inline__ __u64 ___arch__swab64(__u64 x) {
__u64 temp;
__asm__("permh,3210 %0, %0\n\t"
"hshl %0, 8, %1\n\t"
-@@ -60,7 +60,7 @@ static __inline__ __const__ __u64 ___arc
+@@ -61,7 +61,7 @@
#define __arch__swab64(x) ___arch__swab64(x)
#define __BYTEORDER_HAS_U64__
#elif !defined(__STRICT_ANSI__)
--static __inline__ __const__ __u64 ___arch__swab64(__u64 x)
+-static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x)
+static __inline__ __u64 ___arch__swab64(__u64 x)
{
__u32 t1 = ___arch__swab32((__u32) x);
__u32 t2 = ___arch__swab32((__u32) (x >> 32));
-diff -urp include.orig/asm-ppc/byteorder.h include/asm-ppc/byteorder.h
---- include.orig/asm-ppc/byteorder.h 2003-10-15 11:12:10.000000000 -0400
-+++ include/asm-ppc/byteorder.h 2003-11-21 19:27:07.000000000 -0500
-@@ -32,7 +32,7 @@ extern __inline__ void st_le32(volatile
+--- include.orig/asm-ppc/byteorder.h 2005-04-21 09:03:16.000000000 +0900
++++ include/asm-ppc/byteorder.h 2005-05-27 21:43:47.623294516 +0900
+@@ -33,7 +33,7 @@
__asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr));
}
--static __inline__ __const__ __u16 ___arch__swab16(__u16 value)
+-static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 value)
+static __inline__ __u16 ___arch__swab16(__u16 value)
{
__u16 result;
-@@ -40,7 +40,7 @@ static __inline__ __const__ __u16 ___arc
+@@ -41,7 +41,7 @@
return result;
}
--static __inline__ __const__ __u32 ___arch__swab32(__u32 value)
+-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 value)
+static __inline__ __u32 ___arch__swab32(__u32 value)
{
__u32 result;
-diff -urp include.orig/asm-ppc64/byteorder.h include/asm-ppc64/byteorder.h
---- include.orig/asm-ppc64/byteorder.h 2003-10-15 11:15:03.000000000 -0400
-+++ include/asm-ppc64/byteorder.h 2003-11-21 19:27:07.000000000 -0500
-@@ -40,7 +40,7 @@ static __inline__ void st_le32(volatile
+--- 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__ __const__ __u16 ___arch__swab16(__u16 value)
+-static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 value)
+static __inline__ __u16 ___arch__swab16(__u16 value)
{
__u16 result;
-@@ -50,7 +50,7 @@ static __inline__ __const__ __u16 ___arc
+@@ -51,7 +51,7 @@
return result;
}
--static __inline__ __const__ __u32 ___arch__swab32(__u32 value)
+-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 value)
+static __inline__ __u32 ___arch__swab32(__u32 value)
{
__u32 result;
-@@ -62,7 +62,7 @@ static __inline__ __const__ __u32 ___arc
+@@ -63,7 +63,7 @@
return result;
}
--static __inline__ __const__ __u64 ___arch__swab64(__u64 value)
+-static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 value)
+static __inline__ __u64 ___arch__swab64(__u64 value)
{
__u64 result;
#error implement me
-diff -urp include.orig/asm-s390/byteorder.h include/asm-s390/byteorder.h
---- include.orig/asm-s390/byteorder.h 2003-10-15 11:15:04.000000000 -0400
-+++ include/asm-s390/byteorder.h 2003-11-21 19:27:07.000000000 -0500
-@@ -14,7 +14,7 @@
- #ifdef __GNUC__
+--- 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 @@
+ #include <asm/types.h>
+ #include <linux/compiler.h>
- #ifdef __s390x__
--static __inline__ __const__ __u64 ___arch__swab64p(__u64 *x)
-+static __inline__ __u64 ___arch__swab64p(__u64 *x)
- {
- __u64 result;
-
-@@ -24,7 +24,7 @@ static __inline__ __const__ __u64 ___arc
- return result;
- }
-
--static __inline__ __const__ __u64 ___arch__swab64(__u64 x)
-+static __inline__ __u64 ___arch__swab64(__u64 x)
- {
- __u64 result;
-
-@@ -40,7 +40,7 @@ static __inline__ void ___arch__swab64s(
- }
- #endif /* __s390x__ */
-
--static __inline__ __const__ __u32 ___arch__swab32p(__u32 *x)
-+static __inline__ __u32 ___arch__swab32p(__u32 *x)
- {
- __u32 result;
-
-@@ -58,7 +58,7 @@ static __inline__ __const__ __u32 ___arc
- return result;
- }
-
--static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
+-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+static __inline__ __u32 ___arch__swab32(__u32 x)
{
- #ifndef __s390x__
- return ___arch__swab32p(&x);
-@@ -77,7 +77,7 @@ static __inline__ void ___arch__swab32s(
- *x = ___arch__swab32p(x);
+ __asm__("swap.b %0, %0\n\t"
+ "swap.w %0, %0\n\t"
+@@ -18,7 +18,7 @@
+ return x;
}
--static __inline__ __const__ __u16 ___arch__swab16p(__u16 *x)
-+static __inline__ __u16 ___arch__swab16p(__u16 *x)
- {
- __u16 result;
-
-@@ -93,7 +93,7 @@ static __inline__ __const__ __u16 ___arc
- return result;
- }
-
--static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
+-static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
+static __inline__ __u16 ___arch__swab16(__u16 x)
{
- return ___arch__swab16p(&x);
- }
-diff -urp include.orig/asm-sh/byteorder.h include/asm-sh/byteorder.h
---- include.orig/asm-sh/byteorder.h 2003-10-15 11:09:47.000000000 -0400
-+++ include/asm-sh/byteorder.h 2003-11-21 19:27:07.000000000 -0500
-@@ -7,7 +7,7 @@
+ __asm__("swap.b %0, %0"
+ : "=r" (x)
+--- include.orig/asm-sh64/byteorder.h 2005-04-21 09:03:16.000000000 +0900
++++ include/asm-sh64/byteorder.h 2005-05-27 21:50:48.279743143 +0900
+@@ -14,7 +14,7 @@
#include <asm/types.h>
-static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
+static __inline__ __u32 ___arch__swab32(__u32 x)
{
- __asm__("swap.b %0, %0\n\t"
- "swap.w %0, %0\n\t"
-@@ -17,7 +17,7 @@ static __inline__ __const__ __u32 ___arc
+ __asm__("byterev %0, %0\n\t"
+ "shari %0, 32, %0"
+@@ -23,7 +23,7 @@
return x;
}
-static __inline__ __const__ __u16 ___arch__swab16(__u16 x)
+static __inline__ __u16 ___arch__swab16(__u16 x)
{
- __asm__("swap.b %0, %0"
- : "=r" (x)
-diff -urp include.orig/asm-v850/byteorder.h include/asm-v850/byteorder.h
---- include.orig/asm-v850/byteorder.h 2003-10-15 11:14:03.000000000 -0400
-+++ include/asm-v850/byteorder.h 2003-11-21 19:27:07.000000000 -0500
-@@ -18,14 +18,14 @@
+ __asm__("byterev %0, %0\n\t"
+ "shari %0, 48, %0"
+--- include.orig/asm-v850/byteorder.h 2005-04-21 09:03:16.000000000 +0900
++++ include/asm-v850/byteorder.h 2005-05-27 21:45:51.315669274 +0900
+@@ -19,14 +19,14 @@
#ifdef __GNUC__
--static __inline__ __const__ __u32 ___arch__swab32 (__u32 word)
+-static __inline__ __attribute_const__ __u32 ___arch__swab32 (__u32 word)
+static __inline__ __u32 ___arch__swab32 (__u32 word)
{
__u32 res;
@@ -271,63 +191,60 @@
return res;
}
--static __inline__ __const__ __u16 ___arch__swab16 (__u16 half_word)
+-static __inline__ __attribute_const__ __u16 ___arch__swab16 (__u16 half_word)
+static __inline__ __u16 ___arch__swab16 (__u16 half_word)
{
__u16 res;
__asm__ ("bsh %1, %0" : "=r" (res) : "r" (half_word));
-diff -urp include.orig/asm-x86_64/byteorder.h include/asm-x86_64/byteorder.h
---- include.orig/asm-x86_64/byteorder.h 2003-10-15 11:13:30.000000000 -0400
-+++ include/asm-x86_64/byteorder.h 2003-11-21 19:27:07.000000000 -0500
-@@ -5,13 +5,13 @@
+--- include.orig/asm-x86_64/byteorder.h 2005-04-21 09:03:16.000000000 +0900
++++ include/asm-x86_64/byteorder.h 2005-05-27 22:06:28.905489053 +0900
+@@ -6,13 +6,13 @@
#ifdef __GNUC__
--static __inline__ __const__ __u64 ___arch__swab64(__u64 x)
+-static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 x)
+static __inline__ __u64 ___arch__swab64(__u64 x)
{
__asm__("bswapq %0" : "=r" (x) : "0" (x));
return x;
}
--static __inline__ __const__ __u32 ___arch__swab32(__u32 x)
+-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
+static __inline__ __u32 ___arch__swab32(__u32 x)
{
__asm__("bswapl %0" : "=r" (x) : "0" (x));
return x;
-diff -urp include.orig/linux/byteorder/swab.h include/linux/byteorder/swab.h
---- include.orig/linux/byteorder/swab.h 2003-10-15 11:15:04.000000000 -0400
-+++ include/linux/byteorder/swab.h 2003-11-21 19:27:07.000000000 -0500
-@@ -128,7 +128,7 @@
+--- include.orig/linux/byteorder/swab.h 2005-05-27 22:05:04.347036459 +0900
++++ include/linux/byteorder/swab.h 2005-05-27 22:06:52.423277697 +0900
+@@ -130,7 +130,7 @@
#endif /* OPTIMIZE */
--static __inline__ __const__ __u16 __fswab16(__u16 x)
+-static __inline__ __attribute_const__ __u16 __fswab16(__u16 x)
+static __inline__ __u16 __fswab16(__u16 x)
{
return __arch__swab16(x);
}
-@@ -141,7 +141,7 @@ static __inline__ void __swab16s(__u16 *
+@@ -143,7 +143,7 @@
__arch__swab16s(addr);
}
--static __inline__ __const__ __u32 __fswab32(__u32 x)
+-static __inline__ __attribute_const__ __u32 __fswab32(__u32 x)
+static __inline__ __u32 __fswab32(__u32 x)
{
return __arch__swab32(x);
}
-@@ -155,7 +155,7 @@ static __inline__ void __swab32s(__u32 *
- }
+@@ -158,7 +158,7 @@
+ #ifndef __STRICT_ANSI__
#ifdef __BYTEORDER_HAS_U64__
--static __inline__ __const__ __u64 __fswab64(__u64 x)
+-static __inline__ __attribute_const__ __u64 __fswab64(__u64 x)
+static __inline__ __u64 __fswab64(__u64 x)
{
# ifdef __SWAB_64_THRU_32__
__u32 h = x >> 32;
-diff -urp include.orig/linux/byteorder/swabb.h include/linux/byteorder/swabb.h
---- include.orig/linux/byteorder/swabb.h 2003-10-15 11:11:22.000000000 -0400
-+++ include/linux/byteorder/swabb.h 2003-11-21 19:27:07.000000000 -0500
+--- include.orig/linux/byteorder/swabb.h 2005-04-21 09:03:16.000000000 +0900
++++ include/linux/byteorder/swabb.h 2005-05-27 22:07:19.637561723 +0900
@@ -92,7 +92,7 @@
#endif /* OPTIMIZE */
@@ -337,7 +254,7 @@
{
return __arch__swahw32(x);
}
-@@ -106,7 +106,7 @@ static __inline__ void __swahw32s(__u32
+@@ -106,7 +106,7 @@
}
Modified: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/linux-netlink-compilation.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/linux-netlink-compilation.patch 2005-05-27 14:32:01 UTC (rev 907)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/linux-netlink-compilation.patch 2005-05-27 14:33:32 UTC (rev 908)
@@ -1,3 +1,6 @@
+Update 2005-05-05 gotom, move __KERNEL__ in linux/netlink.h in order to
+include in-kernel enum definition.
+
--- include/linux/uio.h.t 2003-11-21 18:27:56.000000000 -0500
+++ include/linux/uio.h 2003-11-21 18:28:23.000000000 -0500
@@ -35,6 +35,8 @@
@@ -15,3 +18,21 @@
#endif
+
+#endif
+--- include.orig/linux/netlink.h 2005-04-21 09:03:16.000000000 +0900
++++ include/linux/netlink.h 2005-05-05 22:34:40.546572593 +0900
+@@ -91,14 +91,13 @@
+ };
+
+ #define NET_MAJOR 36 /* Major 36 is reserved for networking */
++#ifdef __KERNEL__
+
+ enum {
+ NETLINK_UNCONNECTED = 0,
+ NETLINK_CONNECTED,
+ };
+
+-#ifdef __KERNEL__
+-
+ #include <linux/capability.h>
+ #include <linux/skbuff.h>
+
Modified: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/linux-types-and-time.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/linux-types-and-time.patch 2005-05-27 14:32:01 UTC (rev 907)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/linux-types-and-time.patch 2005-05-27 14:33:32 UTC (rev 908)
@@ -1,5 +1,7 @@
---- include/linux/time.h.orig 2003-11-21 19:04:28.000000000 -0500
-+++ include/linux/time.h 2003-11-21 19:04:59.000000000 -0500
+Update 2005-05-05 gotom, add __extension__ for linux/types.h.
+
+--- include.orig/linux/time.h 2005-04-21 09:03:16.000000000 +0900
++++ include/linux/time.h 2005-05-04 15:29:52.266871616 +0900
@@ -1,6 +1,10 @@
#ifndef _LINUX_TIME_H
#define _LINUX_TIME_H
@@ -8,18 +10,18 @@
+#include <time.h>
+#else
+
- #include <asm/param.h>
#include <linux/types.h>
-@@ -383,5 +387,6 @@
+ #ifdef __KERNEL__
+@@ -177,5 +181,6 @@ struct itimerval {
#define TIMER_ABSTIME 0x01
+#endif /* __KERNEL__ DEBIAN */
#endif
---- include/linux/types.h.orig 2003-11-21 19:10:58.000000000 -0500
-+++ include/linux/types.h 2003-11-21 19:07:47.000000000 -0500
+--- include.orig/linux/types.h 2005-04-21 09:03:16.000000000 +0900
++++ include/linux/types.h 2005-05-05 19:26:38.340032389 +0900
@@ -1,6 +1,16 @@
#ifndef _LINUX_TYPES_H
#define _LINUX_TYPES_H
@@ -37,10 +39,25 @@
#ifdef __KERNEL__
#include <linux/config.h>
-@@ -155,4 +165,6 @@
- char f_fpack[6];
- };
+@@ -142,6 +152,8 @@ typedef unsigned long sector_t;
+ #endif /* __KERNEL_STRICT_NAMES */
+
+#endif /* __KERNEL__ DEBIAN */
+
- #endif /* _LINUX_TYPES_H */
+ /*
+ * Below are truly Linux-specific types that should never collide with
+ * any application/library that wants linux/types.h.
+@@ -157,9 +169,9 @@ typedef __u16 __bitwise __le16;
+ typedef __u16 __bitwise __be16;
+ typedef __u32 __bitwise __le32;
+ typedef __u32 __bitwise __be32;
+-#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
+-typedef __u64 __bitwise __le64;
+-typedef __u64 __bitwise __be64;
++#if defined(__GNUC__)
++__extension__ typedef __u64 __bitwise __le64;
++__extension__ typedef __u64 __bitwise __be64;
+ #endif
+
+ struct ustat {
Modified: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/mips-ansi-fixes.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/mips-ansi-fixes.patch 2005-05-27 14:32:01 UTC (rev 907)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/mips-ansi-fixes.patch 2005-05-27 14:33:32 UTC (rev 908)
@@ -1,57 +1,36 @@
-With -ansi in C you can't use C++ comments or 64-bit integers or the
-"inline" keyword.
-
-Fixes <linux/fs.h> under -ansi.
-
---- include/asm-mips/addrspace.h 2003-10-15 11:09:51.000000000 -0400
-+++ include/asm-mips/addrspace.h 2003-12-30 13:56:48.000000000 -0500
-@@ -46,7 +46,7 @@
- #define KSEG2 0xc0000000
- #define KSEG3 0xe0000000
+--- include.orig/asm-mips/atomic.h 2005-04-21 09:03:16.000000000 +0900
++++ include/asm-mips/atomic.h 2005-05-04 17:02:37.441096029 +0900
+@@ -30,6 +30,8 @@ extern spinlock_t atomic_lock;
--//#define K0BASE KSEG0
-+/*#define K0BASE KSEG0 */
-
- /*
- * Returns the kernel segment base of a given address
-@@ -148,7 +148,7 @@
- #define KUBASE 0
- #define KUSIZE_32 0x0000000080000000 /* KUSIZE
- for a 32 bit proc */
--//#define K0BASE 0xa800000000000000
-+/*#define K0BASE 0xa800000000000000 */
- #define K0BASE_EXL_WR K0BASE /* exclusive on write */
- #define K0BASE_NONCOH 0x9800000000000000 /* noncoherent */
- #define K0BASE_EXL 0xa000000000000000 /* exclusive */
---- include/asm-mips/atomic.h 2003-10-15 11:09:47.000000000 -0400
-+++ include/asm-mips/atomic.h 2003-12-30 14:22:58.000000000 -0500
-@@ -19,9 +19,10 @@
- #include <asm/system.h>
-
typedef struct { volatile int counter; } atomic_t;
--typedef struct { volatile __s64 counter; } atomic64_t;
- #ifdef __KERNEL__
-+typedef struct { volatile __s64 counter; } atomic64_t;
++#ifdef __KERNEL__
+
#define ATOMIC_INIT(i) { (i) }
- #define ATOMIC64_INIT(i) { (i) }
---- include/asm-mips/system.h 2003-10-15 11:12:08.000000000 -0400
-+++ include/asm-mips/system.h 2003-12-30 14:23:17.000000000 -0500
-@@ -20,6 +20,8 @@
- #include <asm/addrspace.h>
- #include <asm/ptrace.h>
+ /*
+@@ -650,4 +652,6 @@ static __inline__ long atomic64_sub_if_p
+ #define smp_mb__before_atomic_inc() smp_mb()
+ #define smp_mb__after_atomic_inc() smp_mb()
++#endif /* __KERNEL__ */
++
+ #endif /* _ASM_ATOMIC_H */
+--- include.orig/asm-mips/system.h 2005-04-21 09:03:16.000000000 +0900
++++ include/asm-mips/system.h 2005-05-04 17:02:04.181541329 +0900
+@@ -12,6 +12,8 @@
+ #ifndef _ASM_SYSTEM_H
+ #define _ASM_SYSTEM_H
+
+#ifdef __KERNEL__
+
- __asm__ (
- ".macro\tlocal_irq_enable\n\t"
- ".set\tpush\n\t"
-@@ -386,4 +388,6 @@ static __inline__ int con_is_present(voi
- return serial_console ? 0 : 1;
- }
+ #include <linux/config.h>
+ #include <linux/types.h>
+@@ -435,4 +437,6 @@ do { \
+
+ #define arch_align_stack(x) (x)
+
+#endif /* __KERNEL__ */
+
#endif /* _ASM_SYSTEM_H */
Modified: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/no-linux-compiler-h.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/no-linux-compiler-h.patch 2005-05-27 14:32:01 UTC (rev 907)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/no-linux-compiler-h.patch 2005-05-27 14:33:32 UTC (rev 908)
@@ -1,10 +1,23 @@
Don't define assorted things for userspace. In particular do not define
inline to __attribute__((always_inline)).
---- include/linux/compiler.h 2003-10-15 11:13:09.000000000 -0400
-+++ include/linux/compiler.h.t 2003-11-01 18:04:19.000000000 -0500
-@@ -9,6 +9,15 @@
- # define __kernel
+Update 2005-05-05 gotom, add unexport __builtin_warning for STRICT_ANSI.
+
+--- include.orig/linux/compiler.h 2005-04-21 09:03:16.000000000 +0900
++++ include/linux/compiler.h 2005-05-05 19:09:15.103977954 +0900
+@@ -26,7 +26,9 @@ extern void __chk_io_ptr(void __iomem *)
+ # define __iomem
+ # define __chk_user_ptr(x) (void)0
+ # define __chk_io_ptr(x) (void)0
+-# define __builtin_warning(x, y...) (1)
++# if !defined(__STRICT_ANSI__)
++# define __builtin_warning(x, y...) (1)
++# endif
+ # define __acquires(x)
+ # define __releases(x)
+ # define __acquire(x) (void)0
+@@ -34,6 +36,15 @@ extern void __chk_io_ptr(void __iomem *)
+ # define __cond_lock(x) (x)
#endif
+#if !defined(__KERNEL__)
@@ -16,11 +29,11 @@
+# define __deprecated
+#else
+
- #if __GNUC__ > 3
- # include <linux/compiler-gcc+.h> /* catch-all for GCC 4, 5, etc. */
- #elif __GNUC__ == 3
-@@ -86,4 +95,6 @@
- (typeof(ptr)) (__ptr + (off)); })
+ #ifdef __KERNEL__
+
+ #if __GNUC__ > 4
+@@ -149,4 +160,6 @@ extern void __chk_io_ptr(void __iomem *)
+ #define __always_inline inline
#endif
+#endif /* __KERNEL__ */
Modified: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/usb.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/usb.patch 2005-05-27 14:32:01 UTC (rev 907)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/usb.patch 2005-05-27 14:33:32 UTC (rev 908)
@@ -1,8 +1,10 @@
Fixes use of <linux/usb.h> from userspace.
-diff -ur include.b/linux/usb.h include/linux/usb.h
---- include.b/linux/usb.h 2003-10-15 11:12:09.000000000 -0400
-+++ include/linux/usb.h 2004-01-03 13:27:46.000000000 -0500
+Update 2005-05-05 gotom, usb_ch9.h should include linux/types.h
+instead of asm/types.h due to install __le16.
+
+--- include.orig/linux/usb.h 2005-04-21 20:04:32.000000000 +0900
++++ include/linux/usb.h 2005-05-05 17:20:59.610762324 +0900
@@ -1,7 +1,6 @@
#ifndef __LINUX_USB_H
#define __LINUX_USB_H
@@ -11,29 +13,27 @@
#include <linux/usb_ch9.h>
#define USB_MAJOR 180
-@@ -18,6 +17,7 @@
+@@ -19,6 +18,7 @@
#include <linux/fs.h> /* for struct file_operations */
#include <linux/completion.h> /* for struct completion */
#include <linux/sched.h> /* for current && schedule_timeout */
+#include <linux/mod_devicetable.h>
+ struct usb_device;
+ struct usb_driver;
+--- include.orig/linux/usb_ch9.h 2005-04-21 09:03:16.000000000 +0900
++++ include/linux/usb_ch9.h 2005-05-05 17:14:54.565648303 +0900
+@@ -16,7 +16,7 @@
+ #ifndef __LINUX_USB_CH9_H
+ #define __LINUX_USB_CH9_H
- static __inline__ void wait_ms(unsigned int ms)
-diff -ur include.b/linux/usbdevice_fs.h include/linux/usbdevice_fs.h
---- include.b/linux/usbdevice_fs.h 2003-10-15 11:11:11.000000000 -0400
-+++ include/linux/usbdevice_fs.h 2004-01-03 13:28:06.000000000 -0500
-@@ -31,6 +31,7 @@
- #ifndef _LINUX_USBDEVICE_FS_H
- #define _LINUX_USBDEVICE_FS_H
+-#include <asm/types.h> /* __u8 etc */
++#include <linux/types.h> /* __u8 etc */
-+#include <linux/compiler.h>
- #include <linux/types.h>
+ /*-------------------------------------------------------------------------*/
- /* --------------------------------------------------------------------- */
---- include/linux/usb_ch9.h 2003-10-15 11:12:10.000000000 -0400
-+++ include/linux/usb_ch9.h.o 2004-01-03 13:30:49.000000000 -0500
-@@ -241,8 +241,8 @@
- __u16 wMaxPacketSize;
+@@ -268,8 +268,8 @@
+ __le16 wMaxPacketSize;
__u8 bInterval;
- // NOTE: these two are _only_ in audio endpoints.
Modified: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/videodev2-timeval.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/videodev2-timeval.patch 2005-05-27 14:32:01 UTC (rev 907)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/videodev2-timeval.patch 2005-05-27 14:33:32 UTC (rev 908)
@@ -3,17 +3,16 @@
one in time.h, even though it has the same fields with types of the same
lengths. So just use the userspace one in userspace!
---- include/linux/videodev2.h.orig 2003-10-15 11:13:17.000000000 -0400
-+++ include/linux/videodev2.h 2003-11-20 21:11:02.000000000 -0500
-@@ -13,7 +13,11 @@
- * Justin Schoeman
- * et al.
+Update 2005-05-05 gotom.
+
+--- include.orig/linux/videodev2.h 2005-04-21 09:03:16.000000000 +0900
++++ include/linux/videodev2.h 2005-05-05 18:21:52.639776621 +0900
+@@ -15,6 +15,8 @@
*/
-+#ifdef __KERNEL__
+ #ifdef __KERNEL__
#include <linux/time.h> /* need struct timeval */
-+#else /* not __KERNEL__ */
++#else
+#include <time.h> /* need struct timeval */
-+#endif /* __KERNEL__ */
+ #endif
+ #include <linux/compiler.h> /* need __user */
- /*
- * M I S C E L L A N E O U S
Modified: linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/x86-64-long-long.patch
===================================================================
--- linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/x86-64-long-long.patch 2005-05-27 14:32:01 UTC (rev 907)
+++ linux-kernel-headers/branches/lkh-branch-2.6.12/debian/patches/x86-64-long-long.patch 2005-05-27 14:33:32 UTC (rev 908)
@@ -4,10 +4,12 @@
Remove asm-x86_64/types.h modification, it's actually fixed in
asm-types-long-long.patch. - 2004-07-31 gotom
+Update - 2005-05-04, 2005-05-27 gotom.
+
---- include/asm-x86_64/byteorder.h.orig 2004-04-22 23:15:06.162110704 +0200
-+++ include/asm-x86_64/byteorder.h 2004-04-22 23:17:36.556247320 +0200
-@@ -5,11 +5,13 @@
+--- include.orig/asm-x86_64/byteorder.h 2005-04-21 09:03:16.000000000 +0900
++++ include/asm-x86_64/byteorder.h 2005-05-04 17:27:26.794296763 +0900
+@@ -6,11 +6,13 @@
#ifdef __GNUC__
Reply to: