r1646 - in linux-kernel-headers/trunk/debian: . patches
Author: schizo
Date: 2006-06-10 05:39:33 +0000 (Sat, 10 Jun 2006)
New Revision: 1646
Added:
linux-kernel-headers/trunk/debian/patches/linux-netlink-compilation.patch
linux-kernel-headers/trunk/debian/patches/series
Removed:
linux-kernel-headers/trunk/debian/patches/asm-parisc-unistd.patch
linux-kernel-headers/trunk/debian/patches/asm-ppc-unaligned.patch
linux-kernel-headers/trunk/debian/patches/asm-ppc64-memory.patch
linux-kernel-headers/trunk/debian/patches/linux-joystick.patch
linux-kernel-headers/trunk/debian/patches/linux-netlink-compilation.patch
Modified:
linux-kernel-headers/trunk/debian/changelog
linux-kernel-headers/trunk/debian/control
linux-kernel-headers/trunk/debian/patches/asm-system-and-padding.patch
linux-kernel-headers/trunk/debian/patches/asm-types-long-long.patch
linux-kernel-headers/trunk/debian/patches/byteorder-const.patch
linux-kernel-headers/trunk/debian/patches/hppa-atomic.patch
linux-kernel-headers/trunk/debian/patches/ia64-pt-unwind-warning.patch
linux-kernel-headers/trunk/debian/patches/ioctl-typecheck.patch
linux-kernel-headers/trunk/debian/patches/linux-radix-tree.patch
linux-kernel-headers/trunk/debian/patches/linux-types-and-time.patch
linux-kernel-headers/trunk/debian/patches/linux-types-long-long.patch
linux-kernel-headers/trunk/debian/patches/linux-types-ustat.patch
linux-kernel-headers/trunk/debian/patches/mips-ansi-fixes.patch
linux-kernel-headers/trunk/debian/patches/videodev2-timeval.patch
linux-kernel-headers/trunk/debian/rules
Log:
* New upstream release 2.6.16.20.
* Acknowledge NMU from Steinar Gunderson (Closes: #342780).
- usbdevice_fs.h fix is integrated upstream
* Bump to Standards-Version 3.7.2.
* Switch patch management to quilt, add build-dep.
* Remove asm-parisc-unistd.patch (integrated upstream).
* Remove asm-ppc64-memory.patch.
* Remove asm-ppc-unaligned.patch.
* Tweak and refresh asm-system-and-padding.patch.
* Remove ppc hunk from asm-types-long-long.patch.
* Update byteorder-const.patch.
* Tweak and refresh hppa-atomic.patch.
* Tweak and refresh ia64-pt-unwind-warning.patch.
* Update ioctl-typecheck.patch.
* Remove linux-joystick.patch (integrated upstream).
* Update linux-netlink-compilation.patch.
* Tweak and refresh linux-radix-tree.patch.
* Tweak and refresh linux-types-and-time.patch.
* Update linux-types-long-long.patch.
* Tweak and refresh linux-types-ustat.patch.
* Tweak and refresh mips-ansi-fixes.patch.
* Update videodev2-timeval.patch.
Modified: linux-kernel-headers/trunk/debian/changelog
===================================================================
--- linux-kernel-headers/trunk/debian/changelog 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/changelog 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,3 +1,39 @@
+linux-kernel-headers (2.6.16.20-1) unstable; urgency=low
+
+ * New upstream release 2.6.16.20.
+ * Acknowledge NMU from Steinar Gunderson (Closes: #342780).
+ - usbdevice_fs.h fix is integrated upstream
+ * Bump to Standards-Version 3.7.2.
+ * Switch patch management to quilt, add build-dep.
+ * Remove asm-parisc-unistd.patch (integrated upstream).
+ * Remove asm-ppc64-memory.patch.
+ * Remove asm-ppc-unaligned.patch.
+ * Tweak and refresh asm-system-and-padding.patch.
+ * Remove ppc hunk from asm-types-long-long.patch.
+ * Update byteorder-const.patch.
+ * Tweak and refresh hppa-atomic.patch.
+ * Tweak and refresh ia64-pt-unwind-warning.patch.
+ * Update ioctl-typecheck.patch.
+ * Remove linux-joystick.patch (integrated upstream).
+ * Update linux-netlink-compilation.patch.
+ * Tweak and refresh linux-radix-tree.patch.
+ * Tweak and refresh linux-types-and-time.patch.
+ * Update linux-types-long-long.patch.
+ * Tweak and refresh linux-types-ustat.patch.
+ * Tweak and refresh mips-ansi-fixes.patch.
+ * Update videodev2-timeval.patch.
+
+ -- Clint Adams <schizo@debian.org> Fri, 9 Jun 2006 23:11:52 -0400
+
+linux-kernel-headers (2.6.13+0rc3-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Move <linux/compat.h> down to under the CONFIG_COMPAT #define to avoid
+ breakage when including <linux/usbdevice_fs.h> on 64-bit platforms;
+ patch from Harald Welte. (Closes: #342780)
+
+ -- Steinar H. Gunderson <sesse@debian.org> Mon, 6 Mar 2006 02:29:10 +0100
+
linux-kernel-headers (2.6.13+0rc3-2) unstable; urgency=low
* Acknowledge NMU from Adeodato Simó (Closes: #320515). Thanks!
Modified: linux-kernel-headers/trunk/debian/control
===================================================================
--- linux-kernel-headers/trunk/debian/control 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/control 2006-06-10 05:39:33 UTC (rev 1646)
@@ -2,9 +2,9 @@
Section: devel
Priority: standard
Maintainer: GNU Libc Maintainers <debian-glibc@lists.debian.org>
-Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@nisa.net>, Daniel Jacobowitz <dan@debian.org>
-Build-Depends: debhelper (>= 4.1.0), cdbs
-Standards-Version: 3.6.1
+Uploaders: Ben Collins <bcollins@debian.org>, GOTO Masanori <gotom@debian.org>, Philip Blundell <pb@nexus.co.uk>, Jeff Bailey <jbailey@nisa.net>, Daniel Jacobowitz <dan@debian.org>, Clint Adams <schizo@debian.org>
+Build-Depends: debhelper (>= 4.1.0), cdbs, quilt
+Standards-Version: 3.7.2
Package: linux-kernel-headers
Architecture: any
Deleted: linux-kernel-headers/trunk/debian/patches/asm-parisc-unistd.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/asm-parisc-unistd.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/asm-parisc-unistd.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,23 +0,0 @@
-Make the macro -std=c99 friendly for asm-parisc/unistd.h.
-It's already fixed in the latest cvs.parisc-linux.org.
-
-===================================================================
-RCS file: /var/lib/cvs/linux-2.6/include/asm-parisc/unistd.h,v
-retrieving revision 1.15
-retrieving revision 1.16
-diff -u -r1.15 -r1.16
---- linux-2.6/include/asm-parisc/unistd.h 2005/03/18 13:17:43 1.15
-+++ linux-2.6/include/asm-parisc/unistd.h 2005/03/23 17:13:38 1.16
-@@ -807,10 +807,10 @@
- #define K_INLINE_SYSCALL(name, nr, args...) ({ \
- long __sys_res; \
- { \
-- register unsigned long __res asm("r28"); \
-+ register unsigned long __res __asm__("r28"); \
- K_LOAD_ARGS_##nr(args) \
- /* FIXME: HACK stw/ldw r19 around syscall */ \
-- asm volatile( \
-+ __asm__ volatile( \
- K_STW_ASM_PIC \
- " ble 0x100(%%sr2, %%r0)\n" \
- " ldi %1, %%r20\n" \
Deleted: linux-kernel-headers/trunk/debian/patches/asm-ppc-unaligned.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/asm-ppc-unaligned.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/asm-ppc-unaligned.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,20 +0,0 @@
-linux-kernel-headers Bug#263348: linux-kernel-headers: asm/unaligned.h on powerpc is useless if __KERNEL__ is undefined
-
-This patch removes unneeded #ifdef __KERNEL__ from ppc unaligned.h.
-There's no reason to enclose __KERNEL__, similar to other
-architectures. It also fixes the compilation failure building
-reiserfsprogs on ppc which includes asm/unaligned.h on userland.
-
-
---- include/asm-ppc/unaligned.h 2003-12-15 22:57:40.000000000 +0900
-+++ include/asm-ppc/unaligned.h.new 2004-08-09 12:17:16.000000000 +0900
-@@ -1,4 +1,3 @@
--#ifdef __KERNEL__
- #ifndef __PPC_UNALIGNED_H
- #define __PPC_UNALIGNED_H
-
-@@ -15,4 +14,3 @@
- #define put_unaligned(val, ptr) ((void)( *(ptr) = (val) ))
-
- #endif
--#endif /* __KERNEL__ */
Deleted: linux-kernel-headers/trunk/debian/patches/asm-ppc64-memory.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/asm-ppc64-memory.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/asm-ppc64-memory.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,20 +0,0 @@
-#268078: Change inline -> __inline__.
-
-diff -ruN include/asm-ppc64/memory.h include-new/asm-ppc64/memory.h
---- include/asm-ppc64/memory.h 2004-08-22 15:17:06.035008296 +0000
-+++ include-new/asm-ppc64/memory.h 2004-08-22 15:12:50.302014528 +0000
-@@ -23,12 +23,12 @@
- #define ISYNC_ON_SMP
- #endif
-
--static inline void eieio(void)
-+static __inline__ void eieio(void)
- {
- __asm__ __volatile__ ("eieio" : : : "memory");
- }
-
--static inline void isync(void)
-+static __inline__ void isync(void)
- {
- __asm__ __volatile__ ("isync" : : : "memory");
- }
Modified: linux-kernel-headers/trunk/debian/patches/asm-system-and-padding.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/asm-system-and-padding.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/asm-system-and-padding.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,9 +1,10 @@
Block off the contents of a few more headers, and leave out an unneeded
padding field on LP64 targets.
-diff -urp include/asm-ia64/atomic.h include/asm-ia64/atomic.h
---- include/asm-ia64/atomic.h 2003-10-15 11:10:48.000000000 -0400
-+++ include/asm-ia64/atomic.h 2003-12-30 14:37:52.000000000 -0500
+Index: include/asm-ia64/atomic.h
+===================================================================
+--- include/asm-ia64/atomic.h.orig 2006-06-09 23:40:59.000000000 -0400
++++ include/asm-ia64/atomic.h 2006-06-09 23:45:04.800801461 -0400
@@ -23,6 +23,8 @@
typedef struct { volatile __s32 counter; } atomic_t;
typedef struct { volatile __s64 counter; } atomic64_t;
@@ -13,16 +14,17 @@
#define ATOMIC_INIT(i) ((atomic_t) { (i) })
#define ATOMIC64_INIT(i) ((atomic64_t) { (i) })
-@@ -180,4 +182,6 @@ atomic64_add_negative (__s64 i, atomic64
+@@ -193,5 +195,6 @@
#define smp_mb__before_atomic_inc() barrier()
#define smp_mb__after_atomic_inc() barrier()
+#endif
-+
+ #include <asm-generic/atomic.h>
#endif /* _ASM_IA64_ATOMIC_H */
-diff -urp include/asm-parisc/system.h include/asm-parisc/system.h
---- include/asm-parisc/system.h 2003-10-15 11:13:05.000000000 -0400
-+++ include/asm-parisc/system.h 2003-12-30 14:34:27.000000000 -0500
+Index: include/asm-parisc/system.h
+===================================================================
+--- include/asm-parisc/system.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-parisc/system.h 2006-06-09 23:44:40.074356872 -0400
@@ -1,6 +1,8 @@
#ifndef __PARISC_SYSTEM_H
#define __PARISC_SYSTEM_H
@@ -32,16 +34,17 @@
#include <linux/config.h>
#include <asm/psw.h>
-@@ -157,3 +159,5 @@ typedef struct {
- #endif
+@@ -193,3 +195,5 @@
+ #define arch_align_stack(x) (x)
#endif
+
+#endif
-diff -urp include/asm-sparc/types.h include/asm-sparc/types.h
---- include/asm-sparc/types.h 2003-10-15 11:12:23.000000000 -0400
-+++ include/asm-sparc/types.h 2003-12-30 14:29:37.000000000 -0500
-@@ -28,8 +28,10 @@ typedef unsigned short __u16;
+Index: include/asm-sparc/types.h
+===================================================================
+--- include/asm-sparc/types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-sparc/types.h 2006-06-09 23:44:40.074356872 -0400
+@@ -28,8 +28,10 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -52,10 +55,11 @@
#endif /* __ASSEMBLY__ */
-diff -urp include/asm-sparc64/system.h include/asm-sparc64/system.h
---- include/asm-sparc64/system.h 2003-10-15 11:09:49.000000000 -0400
-+++ include/asm-sparc64/system.h 2003-12-30 14:31:24.000000000 -0500
-@@ -30,6 +30,8 @@ enum sparc_cpu {
+Index: include/asm-sparc64/system.h
+===================================================================
+--- include/asm-sparc64/system.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-sparc64/system.h 2006-06-09 23:44:40.074356872 -0400
+@@ -73,6 +73,8 @@
#endif
@@ -64,17 +68,18 @@
#define setipl(__new_ipl) \
__asm__ __volatile__("wrpr %0, %%pil" : : "r" (__new_ipl) : "memory")
-@@ -334,4 +336,6 @@ __cmpxchg(volatile void *ptr, unsigned l
+@@ -384,4 +386,6 @@
- #endif /* !(__ASSEMBLY__) */
+ #define arch_align_stack(x) (x)
+#endif
+
#endif /* !(__SPARC64_SYSTEM_H) */
-diff -urp include/linux/kernel.h include/linux/kernel.h
---- include/linux/kernel.h 2003-10-15 11:09:46.000000000 -0400
-+++ include/linux/kernel.h 2003-12-30 14:36:08.000000000 -0500
-@@ -223,7 +223,9 @@ struct sysinfo {
+Index: include/linux/kernel.h
+===================================================================
+--- include/linux/kernel.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/linux/kernel.h 2006-06-09 23:44:40.078357267 -0400
+@@ -320,7 +320,9 @@
unsigned long totalhigh; /* Total high memory size */
unsigned long freehigh; /* Available high memory size */
unsigned int mem_unit; /* Memory unit size in bytes */
@@ -83,4 +88,4 @@
+#endif
};
- extern void BUILD_BUG(void);
+ /* Force a compilation error if condition is true */
Modified: linux-kernel-headers/trunk/debian/patches/asm-types-long-long.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/asm-types-long-long.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/asm-types-long-long.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,6 +1,7 @@
-diff -Nuar include.org/asm-arm/types.h include/asm-arm/types.h
---- include.org/asm-arm/types.h 2003-10-16 00:09:54.000000000 +0900
-+++ include/asm-arm/types.h 2004-07-31 22:59:03.000000000 +0900
+Index: include/asm-arm/types.h
+===================================================================
+--- include/asm-arm/types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-arm/types.h 2006-06-09 23:48:20.780078204 -0400
@@ -19,9 +19,9 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -14,9 +15,10 @@
#endif
#endif /* __ASSEMBLY__ */
-diff -Nuar include.org/asm-i386/types.h include/asm-i386/types.h
---- include.org/asm-i386/types.h 2003-10-16 00:13:05.000000000 +0900
-+++ include/asm-i386/types.h 2004-07-31 22:59:43.000000000 +0900
+Index: include/asm-i386/types.h
+===================================================================
+--- include/asm-i386/types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-i386/types.h 2006-06-09 23:48:20.780078204 -0400
@@ -19,9 +19,9 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -30,9 +32,10 @@
#endif
#endif /* __ASSEMBLY__ */
-diff -Nuar include.org/asm-m32r/types.h include/asm-m32r/types.h
---- include.org/asm-m32r/types.h 2005-07-13 13:46:46.000000000 +0900
-+++ include/asm-m32r/types.h 2005-09-07 13:30:25.000000000 +0900
+Index: include/asm-m32r/types.h
+===================================================================
+--- include/asm-m32r/types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-m32r/types.h 2006-06-09 23:48:20.784078596 -0400
@@ -23,9 +23,9 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -46,9 +49,10 @@
#endif
#endif /* __ASSEMBLY__ */
-diff -Nuar include.org/asm-m68k/types.h include/asm-m68k/types.h
---- include.org/asm-m68k/types.h 2003-10-16 00:09:42.000000000 +0900
-+++ include/asm-m68k/types.h 2004-07-31 23:00:13.000000000 +0900
+Index: include/asm-m68k/types.h
+===================================================================
+--- include/asm-m68k/types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-m68k/types.h 2006-06-09 23:48:20.784078596 -0400
@@ -27,9 +27,9 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -62,10 +66,11 @@
#endif
#endif /* __ASSEMBLY__ */
-diff -Nuar include.org/asm-mips/types.h include/asm-mips/types.h
---- include.org/asm-mips/types.h 2003-10-16 00:10:22.000000000 +0900
-+++ include/asm-mips/types.h 2004-07-31 23:00:34.000000000 +0900
-@@ -41,9 +41,9 @@
+Index: include/asm-mips/types.h
+===================================================================
+--- include/asm-mips/types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-mips/types.h 2006-06-09 23:48:20.784078596 -0400
+@@ -34,9 +34,9 @@
#else
@@ -78,9 +83,10 @@
#endif
#endif
-diff -Nuar include.org/asm-parisc/types.h include/asm-parisc/types.h
---- include.org/asm-parisc/types.h 2003-10-16 00:10:33.000000000 +0900
-+++ include/asm-parisc/types.h 2004-07-31 23:01:17.000000000 +0900
+Index: include/asm-parisc/types.h
+===================================================================
+--- include/asm-parisc/types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-parisc/types.h 2006-06-09 23:48:20.784078596 -0400
@@ -19,9 +19,9 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -94,25 +100,10 @@
#endif
#endif /* __ASSEMBLY__ */
-diff -Nuar include.org/asm-ppc/types.h include/asm-ppc/types.h
---- include.org/asm-ppc/types.h 2003-10-16 00:14:24.000000000 +0900
-+++ include/asm-ppc/types.h 2004-07-31 23:01:41.000000000 +0900
-@@ -12,9 +12,9 @@
- typedef __signed__ int __s32;
- typedef unsigned int __u32;
-
--#if defined(__GNUC__) && !defined(__STRICT_ANSI__)
--typedef __signed__ long long __s64;
--typedef unsigned long long __u64;
-+#if defined(__GNUC__)
-+__extension__ typedef __signed__ long long __s64;
-+__extension__ typedef unsigned long long __u64;
- #endif
-
- typedef struct {
-diff -Nuar include.org/asm-sh/types.h include/asm-sh/types.h
---- include.org/asm-sh/types.h 2003-10-16 00:14:30.000000000 +0900
-+++ include/asm-sh/types.h 2004-07-31 23:02:59.000000000 +0900
+Index: include/asm-sh/types.h
+===================================================================
+--- include/asm-sh/types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-sh/types.h 2006-06-09 23:48:20.788078988 -0400
@@ -19,9 +19,9 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -126,9 +117,10 @@
#endif
#endif /* __ASSEMBLY__ */
-diff -Nuar include.org/asm-sparc/types.h include/asm-sparc/types.h
---- include.org/asm-sparc/types.h 2004-07-19 15:47:45.000000000 +0900
-+++ include/asm-sparc/types.h 2004-07-31 23:03:42.000000000 +0900
+Index: include/asm-sparc/types.h
+===================================================================
+--- include/asm-sparc/types.h.orig 2006-06-09 23:44:40.074356872 -0400
++++ include/asm-sparc/types.h 2006-06-09 23:48:20.788078988 -0400
@@ -28,9 +28,9 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
@@ -142,9 +134,10 @@
#endif
#endif /* __ASSEMBLY__ */
-diff -Nuar include.org/asm-x86_64/types.h include/asm-x86_64/types.h
---- include.org/asm-x86_64/types.h 2004-07-31 23:11:07.000000000 +0900
-+++ include/asm-x86_64/types.h 2004-07-31 23:10:40.000000000 +0900
+Index: include/asm-x86_64/types.h
+===================================================================
+--- include/asm-x86_64/types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-x86_64/types.h 2006-06-09 23:48:20.788078988 -0400
@@ -19,8 +19,10 @@
typedef __signed__ int __s32;
typedef unsigned int __u32;
Modified: linux-kernel-headers/trunk/debian/patches/byteorder-const.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/byteorder-const.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/byteorder-const.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -5,8 +5,10 @@
Update 2005-05-27 gotom.
Disable asm-ppc64/byteorder.h patch, move it to asm-ppc64-swab64.patch.
---- 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
+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
@@ -7,7 +7,7 @@
#ifdef __GNUC__
@@ -16,27 +18,10 @@
{
/*
* 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__ __attribute_const__ __u32 ___arch__swab32(__u32 x)
-+extern __inline__ __u32 ___arch__swab32(__u32 x)
- {
- __asm__ ("swapwb %0" : "=r" (x) : "0" (x));
-
- return(x);
- }
-
--extern __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 x)
-+extern __inline__ __u16 ___arch__swab16(__u16 x)
- {
- __asm__ ("swapb %0" : "=r" (x) : "0" (x));
-
---- 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
+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
@@ -6,7 +6,7 @@
#ifdef __GNUC__
@@ -46,8 +31,10 @@
{
__asm__("rolw #8,%0; swap %0; rolw #8,%0" : "=d" (val) : "0" (val));
return val;
---- 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
+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
@@ -6,7 +6,7 @@
#ifdef __GNUC__
@@ -93,48 +80,10 @@
{
__u32 t1 = ___arch__swab32((__u32) x);
__u32 t2 = ___arch__swab32((__u32) (x >> 32));
---- 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__ __attribute_const__ __u16 ___arch__swab16(__u16 value)
-+static __inline__ __u16 ___arch__swab16(__u16 value)
- {
- __u16 result;
-
-@@ -41,7 +41,7 @@
- return result;
- }
-
--static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 value)
-+static __inline__ __u32 ___arch__swab32(__u32 value)
- {
- __u32 result;
-
---- include/asm-ppc64/byteorder.h 2005-07-13 13:46:46.000000000 +0900
-+++ include/asm-ppc64/byteorder.h.gotom 2005-07-22 14:29:23.158998200 +0900
-@@ -40,7 +40,7 @@
- __asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr));
- }
-
--static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 value)
-+static __inline__ __u16 ___arch__swab16(__u16 value)
- {
- __u16 result;
-
-@@ -50,7 +50,7 @@
- return result;
- }
-
--static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 value)
-+static __inline__ __u32 ___arch__swab32(__u32 value)
- {
- __u32 result;
-
---- 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
+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
@@ -8,7 +8,7 @@
#include <asm/types.h>
#include <linux/compiler.h>
@@ -153,8 +102,10 @@
{
__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
+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
@@ -14,7 +14,7 @@
#include <asm/types.h>
@@ -173,8 +124,10 @@
{
__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
+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
@@ -19,14 +19,14 @@
#ifdef __GNUC__
@@ -192,8 +145,10 @@
{
__u16 res;
__asm__ ("bsh %1, %0" : "=r" (res) : "r" (half_word));
---- 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
+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
@@ -6,13 +6,13 @@
#ifdef __GNUC__
@@ -210,8 +165,10 @@
{
__asm__("bswapl %0" : "=r" (x) : "0" (x));
return x;
---- 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
+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
@@ -130,7 +130,7 @@
#endif /* OPTIMIZE */
@@ -239,3 +196,46 @@
{
# ifdef __SWAB_64_THRU_32__
__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
+@@ -9,14 +9,14 @@
+ * them together into ntohl etc.
+ */
+
+-static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
++static inline __u32 ___arch__swab32(__u32 x)
+ {
+ __asm__ ("swapwb %0" : "=r" (x) : "0" (x));
+
+ return(x);
+ }
+
+-static inline __attribute_const__ __u16 ___arch__swab16(__u16 x)
++static inline __u16 ___arch__swab16(__u16 x)
+ {
+ __asm__ ("swapb %0" : "=r" (x) : "0" (x));
+
+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
+@@ -40,7 +40,7 @@
+ __asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr));
+ }
+
+-static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 value)
++static __inline__ __u16 ___arch__swab16(__u16 value)
+ {
+ __u16 result;
+
+@@ -50,7 +50,7 @@
+ return result;
+ }
+
+-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 value)
++static __inline__ __u32 ___arch__swab32(__u32 value)
+ {
+ __u32 result;
+
Modified: linux-kernel-headers/trunk/debian/patches/hppa-atomic.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/hppa-atomic.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/hppa-atomic.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,18 +1,21 @@
---- include/asm-parisc/atomic.h 2003-10-15 11:11:27.000000000 -0400
-+++ include/asm-parisc/atomic.h 2004-01-07 13:14:05.000000000 -0500
-@@ -1,6 +1,8 @@
+Index: include/asm-parisc/atomic.h
+===================================================================
+--- include/asm-parisc/atomic.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-parisc/atomic.h 2006-06-09 23:58:19.250847086 -0400
+@@ -5,6 +5,8 @@
#ifndef _ASM_PARISC_ATOMIC_H_
#define _ASM_PARISC_ATOMIC_H_
+#ifdef __KERNEL__
+
#include <linux/config.h>
+ #include <linux/types.h>
#include <asm/system.h>
+@@ -91,6 +93,7 @@
+ #define xchg(ptr,x) \
+ ((__typeof__(*(ptr)))__xchg((unsigned long)(x),(ptr),sizeof(*(ptr))))
-@@ -181,4 +183,6 @@
- #define smp_mb__before_atomic_inc() smp_mb()
- #define smp_mb__after_atomic_inc() smp_mb()
++#endif /* __KERNEL__ */
-+#endif /* __KERNEL__ */
-+
- #endif
+ #define __HAVE_ARCH_CMPXCHG 1
+
Modified: linux-kernel-headers/trunk/debian/patches/ia64-pt-unwind-warning.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/ia64-pt-unwind-warning.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/ia64-pt-unwind-warning.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,11 +1,13 @@
# Stop warnings about redefined symbols in glibc on ia64.
# From Ian Wienand <ianw@gelato.unsw.edu.au>.
---- linux-2.6.0-test7-bk-orig/include/asm-ia64/elf.h 2003-10-24 02:26:14.622024559 +0000
-+++ linux-2.6.0-test7-bk/include/asm-ia64/elf.h 2003-10-24 02:27:33.785109526 +0000
-@@ -42,8 +42,6 @@
+Index: include/asm-ia64/elf.h
+===================================================================
+--- include/asm-ia64/elf.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-ia64/elf.h 2006-06-10 00:00:17.482483694 -0400
+@@ -43,8 +43,6 @@
*/
- #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000)
+ #define ELF_ET_DYN_BASE (TASK_UNMAPPED_BASE + 0x800000000UL)
-#define PT_IA_64_UNWIND 0x70000001
-
Modified: linux-kernel-headers/trunk/debian/patches/ioctl-typecheck.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/ioctl-typecheck.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/ioctl-typecheck.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,43 +1,7 @@
---- include/asm-cris/ioctl.h~ 2005-05-25 12:31:20.000000000 +0900
-+++ include/asm-cris/ioctl.h 2005-06-03 10:31:42.183033355 +0900
-@@ -53,12 +53,16 @@
- ((nr) << _IOC_NRSHIFT) | \
- ((size) << _IOC_SIZESHIFT))
-
-+#ifdef __KERNEL__
- /* provoke compile error for invalid uses of size argument */
- extern int __invalid_size_argument_for_IOC;
- #define _IOC_TYPECHECK(t) \
- ((sizeof(t) == sizeof(t[1]) && \
- sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
- sizeof(t) : __invalid_size_argument_for_IOC)
-+#else
-+#define _IOC_TYPECHECK(t) (sizeof(t))
-+#endif
-
- /* used to create numbers */
- #define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0)
---- include/asm-i386/ioctl.h~ 2005-05-25 12:31:20.000000000 +0900
-+++ include/asm-i386/ioctl.h 2005-06-03 10:32:02.445331679 +0900
-@@ -52,12 +52,16 @@
- ((nr) << _IOC_NRSHIFT) | \
- ((size) << _IOC_SIZESHIFT))
-
-+#ifdef __KERNEL__
- /* provoke compile error for invalid uses of size argument */
- extern unsigned int __invalid_size_argument_for_IOC;
- #define _IOC_TYPECHECK(t) \
- ((sizeof(t) == sizeof(t[1]) && \
- sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
- sizeof(t) : __invalid_size_argument_for_IOC)
-+#else
-+#define _IOC_TYPECHECK(t) (sizeof(t))
-+#endif
-
- /* used to create numbers */
- #define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0)
---- include/asm-mips/ioctl.h~ 2005-05-25 12:31:20.000000000 +0900
-+++ include/asm-mips/ioctl.h 2005-06-03 10:32:25.846211467 +0900
+Index: include/asm-mips/ioctl.h
+===================================================================
+--- include/asm-mips/ioctl.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-mips/ioctl.h 2006-06-10 00:06:12.610775883 -0400
@@ -65,12 +65,16 @@
((nr) << _IOC_NRSHIFT) | \
((size) << _IOC_SIZESHIFT))
@@ -55,8 +19,10 @@
/* used to create numbers */
#define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0)
---- include/asm-parisc/ioctl.h~ 2005-05-25 12:31:20.000000000 +0900
-+++ include/asm-parisc/ioctl.h 2005-06-03 10:32:57.800950606 +0900
+Index: include/asm-parisc/ioctl.h
+===================================================================
+--- include/asm-parisc/ioctl.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-parisc/ioctl.h 2006-06-10 00:06:12.610775883 -0400
@@ -60,12 +60,16 @@
((nr) << _IOC_NRSHIFT) | \
((size) << _IOC_SIZESHIFT))
@@ -74,8 +40,10 @@
/* used to create numbers */
#define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0)
---- include/asm-ppc/ioctl.h~ 2005-05-25 12:31:20.000000000 +0900
-+++ include/asm-ppc/ioctl.h 2005-06-03 10:33:19.391071705 +0900
+Index: include/asm-powerpc/ioctl.h
+===================================================================
+--- include/asm-powerpc/ioctl.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-powerpc/ioctl.h 2006-06-10 00:06:12.614776309 -0400
@@ -37,12 +37,16 @@
((nr) << _IOC_NRSHIFT) | \
((size) << _IOC_SIZESHIFT))
@@ -93,9 +61,11 @@
/* used to create numbers */
#define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0)
---- include/asm-ppc64/ioctl.h~ 2005-05-25 12:31:20.000000000 +0900
-+++ include/asm-ppc64/ioctl.h 2005-06-03 10:33:36.177833268 +0900
-@@ -42,12 +42,16 @@
+Index: include/asm-generic/ioctl.h
+===================================================================
+--- include/asm-generic/ioctl.h.orig 2006-06-10 00:06:20.000000000 -0400
++++ include/asm-generic/ioctl.h 2006-06-10 00:06:52.899067188 -0400
+@@ -47,12 +47,16 @@
((nr) << _IOC_NRSHIFT) | \
((size) << _IOC_SIZESHIFT))
@@ -103,25 +73,6 @@
/* provoke compile error for invalid uses of size argument */
extern unsigned int __invalid_size_argument_for_IOC;
#define _IOC_TYPECHECK(t) \
- ((sizeof(t) == sizeof(t[1]) && \
- sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
- sizeof(t) : __invalid_size_argument_for_IOC)
-+#else
-+#define _IOC_TYPECHECK(t) (sizeof(t))
-+#endif
-
- /* used to create numbers */
- #define _IO(type,nr) _IOC(_IOC_NONE,(type),(nr),0)
---- include/asm-s390/ioctl.h~ 2005-05-25 12:31:20.000000000 +0900
-+++ include/asm-s390/ioctl.h 2005-06-03 10:33:55.849210144 +0900
-@@ -55,12 +55,16 @@
- ((nr) << _IOC_NRSHIFT) | \
- ((size) << _IOC_SIZESHIFT))
-
-+#ifdef __KERNEL__
- /* provoke compile error for invalid uses of size argument */
- extern unsigned long __invalid_size_argument_for_IOC;
- #define _IOC_TYPECHECK(t) \
((sizeof(t) == sizeof(t[1]) && \
sizeof(t) < (1 << _IOC_SIZEBITS)) ? \
sizeof(t) : __invalid_size_argument_for_IOC)
Deleted: linux-kernel-headers/trunk/debian/patches/linux-joystick.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/linux-joystick.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/linux-joystick.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,20 +0,0 @@
-2005-08-07 adeodato
-Wrap the usage of BITS_PER_LONG with #ifdef __KERNEL__ (#320515)
-
---- include/linux/joystick.h
-+++ include/linux/joystick.h
-@@ -134,6 +134,7 @@
- struct JS_DATA_TYPE JS_CORR;
- };
-
-+#ifdef __KERNEL__
- #if BITS_PER_LONG == 64
- #define JS_DATA_SAVE_TYPE JS_DATA_SAVE_TYPE_64
- #elif BITS_PER_LONG == 32
-@@ -141,5 +142,6 @@
- #else
- #error Unexpected BITS_PER_LONG
- #endif
-+#endif
-
- #endif /* _LINUX_JOYSTICK_H */
Deleted: linux-kernel-headers/trunk/debian/patches/linux-netlink-compilation.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/linux-netlink-compilation.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/linux-netlink-compilation.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,38 +0,0 @@
-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 @@
- /* Beg pardon: BSD has 1024 --ANK */
- #endif
-
-+#ifdef __KERNEL__
-+
- /*
- * Total number of bytes covered by an iovec.
- *
-@@ -55,3 +57,5 @@
- unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to);
-
- #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>
-
Added: linux-kernel-headers/trunk/debian/patches/linux-netlink-compilation.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/linux-netlink-compilation.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/linux-netlink-compilation.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -0,0 +1,41 @@
+Index: include/linux/netlink.h
+===================================================================
+--- include/linux/netlink.h.orig 2006-06-10 00:44:04.000000000 -0400
++++ include/linux/netlink.h 2006-06-10 01:21:41.412266032 -0400
+@@ -106,6 +106,8 @@
+
+ #define NET_MAJOR 36 /* Major 36 is reserved for networking */
+
++#ifdef __KERNEL__
++
+ enum {
+ NETLINK_UNCONNECTED = 0,
+ NETLINK_CONNECTED,
+@@ -130,8 +132,6 @@
+ #define NLA_ALIGN(len) (((len) + NLA_ALIGNTO - 1) & ~(NLA_ALIGNTO - 1))
+ #define NLA_HDRLEN ((int) NLA_ALIGN(sizeof(struct nlattr)))
+
+-#ifdef __KERNEL__
+-
+ #include <linux/capability.h>
+ #include <linux/skbuff.h>
+
+Index: include/linux/uio.h
+===================================================================
+--- include/linux/uio.h.orig 2006-06-10 01:22:10.000000000 -0400
++++ include/linux/uio.h 2006-06-10 01:23:20.222133536 -0400
+@@ -30,8 +30,6 @@
+ size_t iov_len;
+ };
+
+-#endif
+-
+ /*
+ * UIO_MAXIOV shall be at least 16 1003.1g (5.4.1.1)
+ */
+@@ -64,3 +62,5 @@
+ unsigned long iov_shorten(struct iovec *iov, unsigned long nr_segs, size_t to);
+
+ #endif
++
++#endif
Modified: linux-kernel-headers/trunk/debian/patches/linux-radix-tree.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/linux-radix-tree.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/linux-radix-tree.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,18 +1,20 @@
Included by a lot of other <linux/> headers. Shouldn't be needed outside of
__KERNEL__.
---- include/linux/radix-tree.h.orig 2003-10-15 11:11:21.000000000 -0400
-+++ include/linux/radix-tree.h 2003-11-05 09:30:42.000000000 -0500
+Index: include/linux/radix-tree.h
+===================================================================
+--- include/linux/radix-tree.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/linux/radix-tree.h 2006-06-10 00:14:28.847484175 -0400
@@ -19,6 +19,8 @@
#ifndef _LINUX_RADIX_TREE_H
#define _LINUX_RADIX_TREE_H
+#ifdef __KERNEL__
+
+ #include <linux/sched.h>
#include <linux/preempt.h>
-
- struct radix_tree_node;
-@@ -54,4 +56,5 @@
+ #include <linux/types.h>
+@@ -70,4 +72,5 @@
preempt_enable();
}
Modified: linux-kernel-headers/trunk/debian/patches/linux-types-and-time.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/linux-types-and-time.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/linux-types-and-time.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,7 +1,9 @@
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
+Index: include/linux/time.h
+===================================================================
+--- include/linux/time.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/linux/time.h 2006-06-10 00:16:51.962628154 -0400
@@ -1,6 +1,10 @@
#ifndef _LINUX_TIME_H
#define _LINUX_TIME_H
@@ -13,15 +15,17 @@
#include <linux/types.h>
#ifdef __KERNEL__
-@@ -177,5 +181,6 @@ struct itimerval {
+@@ -196,4 +200,6 @@
+ */
+ #define TIMER_ABSTIME 0x01
- #define TIMER_ABSTIME 0x01
-
+#endif /* __KERNEL__ DEBIAN */
-
++
#endif
---- 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
+Index: include/linux/types.h
+===================================================================
+--- include/linux/types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/linux/types.h 2006-06-10 00:16:51.962628154 -0400
@@ -1,6 +1,16 @@
#ifndef _LINUX_TYPES_H
#define _LINUX_TYPES_H
@@ -39,7 +43,7 @@
#ifdef __KERNEL__
#include <linux/config.h>
-@@ -142,6 +152,8 @@ typedef unsigned long sector_t;
+@@ -147,6 +157,8 @@
#endif /* __KERNEL_STRICT_NAMES */
@@ -48,7 +52,7 @@
/*
* 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;
+@@ -167,9 +179,9 @@
typedef __u16 __bitwise __be16;
typedef __u32 __bitwise __le32;
typedef __u32 __bitwise __be32;
@@ -60,4 +64,4 @@
+__extension__ typedef __u64 __bitwise __be64;
#endif
- struct ustat {
+ #ifdef __KERNEL__
Modified: linux-kernel-headers/trunk/debian/patches/linux-types-long-long.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/linux-types-long-long.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/linux-types-long-long.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,10 +1,11 @@
Add some __extension__ keywords to let <linux/types.h> work with -ansi
-pedantic.
-diff -Nurp include.orig/asm-alpha/posix_types.h include/asm-alpha/posix_types.h
---- include.orig/asm-alpha/posix_types.h 2003-10-15 11:13:20.000000000 -0400
-+++ include/asm-alpha/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -11,7 +11,7 @@ typedef unsigned int __kernel_ino_t;
+Index: include/asm-alpha/posix_types.h
+===================================================================
+--- include/asm-alpha/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-alpha/posix_types.h 2006-06-10 00:18:05.990311897 -0400
+@@ -11,7 +11,7 @@
typedef unsigned int __kernel_mode_t;
typedef unsigned int __kernel_nlink_t;
typedef long __kernel_off_t;
@@ -13,10 +14,11 @@
typedef int __kernel_pid_t;
typedef int __kernel_ipc_pid_t;
typedef unsigned int __kernel_uid_t;
-diff -Nurp include.orig/asm-arm/posix_types.h include/asm-arm/posix_types.h
---- include.orig/asm-arm/posix_types.h 2003-10-15 11:10:23.000000000 -0400
-+++ include/asm-arm/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -47,7 +47,7 @@ typedef unsigned short __kernel_old_gid
+Index: include/asm-arm/posix_types.h
+===================================================================
+--- include/asm-arm/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-arm/posix_types.h 2006-06-10 00:18:05.990311897 -0400
+@@ -47,7 +47,7 @@
typedef unsigned short __kernel_old_dev_t;
#ifdef __GNUC__
@@ -25,11 +27,12 @@
#endif
typedef struct {
-diff -Nurp include.orig/asm-arm26/posix_types.h include/asm-arm26/posix_types.h
---- include.orig/asm-arm26/posix_types.h 2003-10-15 11:13:14.000000000 -0400
-+++ include/asm-arm26/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -46,7 +46,7 @@ typedef unsigned short __kernel_old_uid
- typedef unsigned short __kernel_old_gid_t;
+Index: include/asm-arm26/posix_types.h
+===================================================================
+--- include/asm-arm26/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-arm26/posix_types.h 2006-06-10 00:18:05.994312290 -0400
+@@ -47,7 +47,7 @@
+ typedef unsigned short __kernel_old_dev_t;
#ifdef __GNUC__
-typedef long long __kernel_loff_t;
@@ -37,10 +40,11 @@
#endif
typedef struct {
-diff -Nurp include.orig/asm-cris/posix_types.h include/asm-cris/posix_types.h
---- include.orig/asm-cris/posix_types.h 2003-10-15 11:10:49.000000000 -0400
-+++ include/asm-cris/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -42,7 +42,7 @@ typedef unsigned short __kernel_old_gid
+Index: include/asm-cris/posix_types.h
+===================================================================
+--- include/asm-cris/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-cris/posix_types.h 2006-06-10 00:18:05.994312290 -0400
+@@ -42,7 +42,7 @@
typedef unsigned short __kernel_old_dev_t;
#ifdef __GNUC__
@@ -49,10 +53,11 @@
#endif
typedef struct {
-diff -Nurp include.orig/asm-h8300/posix_types.h include/asm-h8300/posix_types.h
---- include.orig/asm-h8300/posix_types.h 2003-10-15 11:09:47.000000000 -0400
-+++ include/asm-h8300/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -34,7 +34,7 @@ typedef unsigned short __kernel_old_uid_
+Index: include/asm-h8300/posix_types.h
+===================================================================
+--- include/asm-h8300/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-h8300/posix_types.h 2006-06-10 00:18:05.994312290 -0400
+@@ -34,7 +34,7 @@
typedef unsigned short __kernel_old_gid_t;
#ifdef __GNUC__
@@ -61,10 +66,11 @@
#endif
typedef struct {
-diff -Nurp include.orig/asm-i386/posix_types.h include/asm-i386/posix_types.h
---- include.orig/asm-i386/posix_types.h 2003-10-15 11:14:51.000000000 -0400
-+++ include/asm-i386/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -35,7 +35,7 @@ typedef unsigned short __kernel_old_gid_
+Index: include/asm-i386/posix_types.h
+===================================================================
+--- include/asm-i386/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-i386/posix_types.h 2006-06-10 00:18:05.994312290 -0400
+@@ -35,7 +35,7 @@
typedef unsigned short __kernel_old_dev_t;
#ifdef __GNUC__
@@ -73,10 +79,11 @@
#endif
typedef struct {
-diff -Nurp include.orig/asm-ia64/posix_types.h include/asm-ia64/posix_types.h
---- include.orig/asm-ia64/posix_types.h 2003-10-15 11:11:26.000000000 -0400
-+++ include/asm-ia64/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -14,7 +14,7 @@ typedef unsigned int __kernel_ino_t;
+Index: include/asm-ia64/posix_types.h
+===================================================================
+--- include/asm-ia64/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-ia64/posix_types.h 2006-06-10 00:18:05.998312683 -0400
+@@ -16,7 +16,7 @@
typedef unsigned int __kernel_mode_t;
typedef unsigned int __kernel_nlink_t;
typedef long __kernel_off_t;
@@ -85,10 +92,11 @@
typedef int __kernel_pid_t;
typedef int __kernel_ipc_pid_t;
typedef unsigned int __kernel_uid_t;
-diff -Nurp include.orig/asm-m32r/posix_types.h include/asm-m32r/posix_types.h
---- include.orig/asm-m32r/posix_types.h 2005-07-13 13:46:46.000000000 +0900
-+++ include/asm-m32r/posix_types.h 2005-09-07 13:24:21.000000000 +0900
-@@ -39,7 +39,7 @@ typedef unsigned short __kernel_old_gid_
+Index: include/asm-m32r/posix_types.h
+===================================================================
+--- include/asm-m32r/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-m32r/posix_types.h 2006-06-10 00:18:05.998312683 -0400
+@@ -39,7 +39,7 @@
typedef unsigned short __kernel_old_dev_t;
#ifdef __GNUC__
@@ -97,10 +105,11 @@
#endif
typedef struct {
-diff -Nurp include.orig/asm-m68k/posix_types.h include/asm-m68k/posix_types.h
---- include.orig/asm-m68k/posix_types.h 2003-10-15 11:10:27.000000000 -0400
-+++ include/asm-m68k/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -35,7 +35,7 @@ typedef unsigned short __kernel_old_gid_
+Index: include/asm-m68k/posix_types.h
+===================================================================
+--- include/asm-m68k/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-m68k/posix_types.h 2006-06-10 00:18:05.998312683 -0400
+@@ -35,7 +35,7 @@
typedef unsigned short __kernel_old_dev_t;
#ifdef __GNUC__
@@ -109,10 +118,11 @@
#endif
typedef struct {
-diff -Nurp include.orig/asm-mips/posix_types.h include/asm-mips/posix_types.h
---- include.orig/asm-mips/posix_types.h 2003-10-15 11:13:08.000000000 -0400
-+++ include/asm-mips/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -57,7 +57,7 @@ typedef __kernel_gid_t __kernel_old_gid_
+Index: include/asm-mips/posix_types.h
+===================================================================
+--- include/asm-mips/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-mips/posix_types.h 2006-06-10 00:18:05.998312683 -0400
+@@ -57,7 +57,7 @@
typedef unsigned int __kernel_old_dev_t;
#ifdef __GNUC__
@@ -121,10 +131,11 @@
#endif
typedef struct {
-diff -Nurp include.orig/asm-parisc/posix_types.h include/asm-parisc/posix_types.h
---- include.orig/asm-parisc/posix_types.h 2003-10-15 11:14:14.000000000 -0400
-+++ include/asm-parisc/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -39,9 +39,9 @@ typedef unsigned int __kernel_uid32_t;
+Index: include/asm-parisc/posix_types.h
+===================================================================
+--- include/asm-parisc/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-parisc/posix_types.h 2006-06-10 00:18:06.002313076 -0400
+@@ -39,9 +39,9 @@
typedef unsigned int __kernel_gid32_t;
#ifdef __GNUC__
@@ -137,34 +148,24 @@
#endif
typedef unsigned int __kernel_old_dev_t;
-diff -Nurp include.orig/asm-ppc/posix_types.h include/asm-ppc/posix_types.h
---- include.orig/asm-ppc/posix_types.h 2003-10-15 11:12:09.000000000 -0400
-+++ include/asm-ppc/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -35,7 +35,7 @@ typedef unsigned int __kernel_old_gid_t;
- typedef unsigned int __kernel_old_dev_t;
-
+Index: include/asm-powerpc/posix_types.h
+===================================================================
+--- include/asm-powerpc/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-powerpc/posix_types.h 2006-06-10 00:18:06.002313076 -0400
+@@ -46,7 +46,7 @@
+ typedef long long __kernel_loff_t;
+ #else
#ifdef __GNUC__
-typedef long long __kernel_loff_t;
+__extension__ typedef long long __kernel_loff_t;
#endif
+ #endif
- typedef struct {
-diff -Nurp include.orig/asm-ppc64/posix_types.h include/asm-ppc64/posix_types.h
---- include.orig/asm-ppc64/posix_types.h 2003-10-15 11:15:13.000000000 -0400
-+++ include/asm-ppc64/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -16,7 +16,7 @@ typedef unsigned long __kernel_ino_t;
- typedef unsigned long __kernel_nlink_t;
- typedef unsigned int __kernel_mode_t;
- typedef long __kernel_off_t;
--typedef long long __kernel_loff_t;
-+__extension__ typedef long long __kernel_loff_t;
- typedef int __kernel_pid_t;
- typedef int __kernel_ipc_pid_t;
- typedef unsigned int __kernel_uid_t;
-diff -Nurp include.orig/asm-s390/posix_types.h include/asm-s390/posix_types.h
---- include.orig/asm-s390/posix_types.h 2003-10-15 11:09:43.000000000 -0400
-+++ include/asm-s390/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -29,7 +29,7 @@ typedef unsigned short __kernel_uid16_t;
+Index: include/asm-s390/posix_types.h
+===================================================================
+--- include/asm-s390/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-s390/posix_types.h 2006-06-10 00:18:06.002313076 -0400
+@@ -29,7 +29,7 @@
typedef unsigned short __kernel_gid16_t;
#ifdef __GNUC__
@@ -173,10 +174,11 @@
#endif
#ifndef __s390x__
-diff -Nurp include.orig/asm-sh/posix_types.h include/asm-sh/posix_types.h
---- include.orig/asm-sh/posix_types.h 2003-10-15 11:12:09.000000000 -0400
-+++ include/asm-sh/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -35,7 +35,7 @@ typedef unsigned short __kernel_old_gid_
+Index: include/asm-sh/posix_types.h
+===================================================================
+--- include/asm-sh/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-sh/posix_types.h 2006-06-10 00:18:06.002313076 -0400
+@@ -35,7 +35,7 @@
typedef unsigned short __kernel_old_dev_t;
#ifdef __GNUC__
@@ -185,10 +187,11 @@
#endif
typedef struct {
-diff -Nurp include.orig/asm-sparc/posix_types.h include/asm-sparc/posix_types.h
---- include.orig/asm-sparc/posix_types.h 2003-10-15 11:11:26.000000000 -0400
-+++ include/asm-sparc/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -35,7 +35,7 @@ typedef int __kernel_
+Index: include/asm-sparc/posix_types.h
+===================================================================
+--- include/asm-sparc/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-sparc/posix_types.h 2006-06-10 00:18:06.006313469 -0400
+@@ -35,7 +35,7 @@
typedef int __kernel_timer_t;
#ifdef __GNUC__
@@ -197,10 +200,11 @@
#endif
typedef struct {
-diff -Nurp include.orig/asm-sparc64/posix_types.h include/asm-sparc64/posix_types.h
---- include.orig/asm-sparc64/posix_types.h 2003-10-15 11:14:20.000000000 -0400
-+++ include/asm-sparc64/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -39,7 +39,7 @@ typedef unsigned int __kernel_old
+Index: include/asm-sparc64/posix_types.h
+===================================================================
+--- include/asm-sparc64/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-sparc64/posix_types.h 2006-06-10 00:18:06.006313469 -0400
+@@ -39,7 +39,7 @@
typedef int __kernel_suseconds_t;
#ifdef __GNUC__
@@ -209,9 +213,10 @@
#endif
typedef struct {
-diff -Nurp include.orig/asm-v850/posix_types.h include/asm-v850/posix_types.h
---- include.orig/asm-v850/posix_types.h 2003-10-15 11:15:13.000000000 -0400
-+++ include/asm-v850/posix_types.h 2003-11-23 16:08:42.000000000 -0500
+Index: include/asm-v850/posix_types.h
+===================================================================
+--- include/asm-v850/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-v850/posix_types.h 2006-06-10 00:18:06.006313469 -0400
@@ -15,11 +15,11 @@
#define __V850_POSIX_TYPES_H__
@@ -226,10 +231,11 @@
typedef int __kernel_pid_t;
typedef unsigned short __kernel_ipc_pid_t;
typedef unsigned int __kernel_uid_t;
-diff -Nurp include.orig/asm-x86_64/posix_types.h include/asm-x86_64/posix_types.h
---- include.orig/asm-x86_64/posix_types.h 2003-10-15 11:15:02.000000000 -0400
-+++ include/asm-x86_64/posix_types.h 2003-11-23 16:08:42.000000000 -0500
-@@ -29,7 +29,7 @@ typedef unsigned short __kernel_uid16_t;
+Index: include/asm-x86_64/posix_types.h
+===================================================================
+--- include/asm-x86_64/posix_types.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-x86_64/posix_types.h 2006-06-10 00:18:06.006313469 -0400
+@@ -29,7 +29,7 @@
typedef unsigned short __kernel_gid16_t;
#ifdef __GNUC__
Modified: linux-kernel-headers/trunk/debian/patches/linux-types-ustat.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/linux-types-ustat.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/linux-types-ustat.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,11 +1,13 @@
Fixes glibc NPTL build on S/390. I seem to recall SH being affected by this
too.
---- linux-kernel-headers/include/linux/types.h.bak 2003-10-15 11:14:22.000000000 -0400
-+++ linux-kernel-headers/include/linux/types.h 2003-10-26 14:34:05.000000000 -0500
-@@ -148,11 +148,14 @@ typedef unsigned long sector_t;
- * any application/library that wants linux/types.h.
- */
+Index: include/linux/types.h
+===================================================================
+--- include/linux/types.h.orig 2006-06-10 00:16:51.962628154 -0400
++++ include/linux/types.h 2006-06-10 00:20:28.592333583 -0400
+@@ -188,11 +188,14 @@
+ typedef unsigned __bitwise__ gfp_t;
+ #endif
+#if 0
+/* Debian: This is available from <sys/ustat.h>. */
Modified: linux-kernel-headers/trunk/debian/patches/mips-ansi-fixes.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/mips-ansi-fixes.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/mips-ansi-fixes.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -1,6 +1,8 @@
---- 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;
+Index: include/asm-mips/atomic.h
+===================================================================
+--- include/asm-mips/atomic.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-mips/atomic.h 2006-06-10 00:22:40.481313069 -0400
+@@ -29,6 +29,8 @@
typedef struct { volatile int counter; } atomic_t;
@@ -9,15 +11,17 @@
#define ATOMIC_INIT(i) { (i) }
/*
-@@ -650,4 +652,6 @@ static __inline__ long atomic64_sub_if_p
+@@ -725,5 +727,6 @@
#define smp_mb__before_atomic_inc() smp_mb()
#define smp_mb__after_atomic_inc() smp_mb()
+#endif /* __KERNEL__ */
-+
+ #include <asm-generic/atomic.h>
#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
+Index: include/asm-mips/system.h
+===================================================================
+--- include/asm-mips/system.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/asm-mips/system.h 2006-06-10 00:22:40.481313069 -0400
@@ -12,6 +12,8 @@
#ifndef _ASM_SYSTEM_H
#define _ASM_SYSTEM_H
@@ -27,7 +31,7 @@
#include <linux/config.h>
#include <linux/types.h>
-@@ -435,4 +437,6 @@ do { \
+@@ -462,4 +464,6 @@
#define arch_align_stack(x) (x)
Added: linux-kernel-headers/trunk/debian/patches/series
===================================================================
--- linux-kernel-headers/trunk/debian/patches/series 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/series 2006-06-10 05:39:33 UTC (rev 1646)
@@ -0,0 +1,33 @@
+alpha-ansi.patch -p0
+alpha-asm-param.patch -p0
+arm-query-module.patch -p0
+asm-i386-byteorder-u64.patch -p0
+asm-system-and-padding.patch -p0
+asm-types-long-long.patch -p0
+byteorder-const.patch -p0
+byteorder-inline.patch -p0
+byteorder.patch -p0
+hppa-atomic.patch -p0
+ia64-byteorder.patch -p0
+ia64-modutils.patch -p0
+ia64-pal.patch -p0
+ia64-pt-unwind-warning.patch -p0
+ioctl-typecheck.patch -p0
+linux-capi.patch -p0
+linux-fs-types.patch -p0
+linux-if_fddi.patch -p0
+linux-list-quiet-warning.patch -p0
+linux-netlink-compilation.patch -p0
+linux-pci.patch -p0
+linux-radix-tree.patch -p0
+linux-types-and-time.patch -p0
+linux-types-long-long.patch -p0
+linux-types-ustat.patch -p0
+linux-unistd-errno.patch -p0
+mips-ansi-fixes.patch -p0
+no-linux-compiler-h.patch -p0
+s390-asm-types.patch -p0
+sparc-asm-fbio.patch -p0
+spinlock.patch -p0
+usb.patch -p0
+videodev2-timeval.patch -p0
Modified: linux-kernel-headers/trunk/debian/patches/videodev2-timeval.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/videodev2-timeval.patch 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/patches/videodev2-timeval.patch 2006-06-10 05:39:33 UTC (rev 1646)
@@ -5,12 +5,14 @@
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__
+Index: include/linux/videodev2.h
+===================================================================
+--- include/linux/videodev2.h.orig 2006-06-05 13:18:23.000000000 -0400
++++ include/linux/videodev2.h 2006-06-10 00:24:32.932387855 -0400
+@@ -17,6 +17,8 @@
#include <linux/time.h> /* need struct timeval */
+ #include <linux/poll.h>
+ #include <linux/device.h>
+#else
+#include <time.h> /* need struct timeval */
#endif
Modified: linux-kernel-headers/trunk/debian/rules
===================================================================
--- linux-kernel-headers/trunk/debian/rules 2006-06-09 16:13:33 UTC (rev 1645)
+++ linux-kernel-headers/trunk/debian/rules 2006-06-10 05:39:33 UTC (rev 1646)
@@ -7,7 +7,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
# Simple patches in debian/patches.
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
pkgdir = debian/linux-kernel-headers
includedir = $(pkgdir)/usr/include
Reply to: