r1801 - in linux-kernel-headers/trunk/debian: . patches
Author: schizo
Date: 2006-09-07 17:27:59 +0000 (Thu, 07 Sep 2006)
New Revision: 1801
Added:
linux-kernel-headers/trunk/debian/patches/asm-generic-bitops-fls64.patch
linux-kernel-headers/trunk/debian/patches/asm-generic-div64.patch
linux-kernel-headers/trunk/debian/patches/linux-futex.patch
Modified:
linux-kernel-headers/trunk/debian/changelog
linux-kernel-headers/trunk/debian/patches/linux-joystick.patch
linux-kernel-headers/trunk/debian/patches/series
Log:
sync svn with 2.6.17.10-3 package
Modified: linux-kernel-headers/trunk/debian/changelog
===================================================================
--- linux-kernel-headers/trunk/debian/changelog 2006-08-30 07:29:10 UTC (rev 1800)
+++ linux-kernel-headers/trunk/debian/changelog 2006-09-07 17:27:59 UTC (rev 1801)
@@ -1,3 +1,38 @@
+linux-kernel-headers (2.6.17.10-3) unstable; urgency=medium
+
+ * Apply patch from James Bruce to fix linux/joystick.h.
+ closes: #378295.
+
+ -- Clint Adams <schizo@debian.org> Thu, 7 Sep 2006 11:57:06 -0400
+
+linux-kernel-headers (2.6.17.10-2) unstable; urgency=low
+
+ * Replace div64.h with an #error. closes: #382419.
+
+ -- Clint Adams <schizo@debian.org> Mon, 4 Sep 2006 19:55:07 -0400
+
+linux-kernel-headers (2.6.17.10-1) unstable; urgency=low
+
+ * New upstream release 2.6.17.10.
+
+ -- Clint Adams <schizo@debian.org> Tue, 22 Aug 2006 22:43:10 -0400
+
+linux-kernel-headers (2.6.17.8-1) unstable; urgency=high
+
+ * New upstream release 2.6.17.8.
+ * Apply patch from Thomas Schmidt to fix broken
+ asm-generic/bitops/fls64.h. closes: #379720.
+
+ -- Clint Adams <schizo@debian.org> Tue, 15 Aug 2006 00:30:26 -0400
+
+linux-kernel-headers (2.6.17.7-1) unstable; urgency=low
+
+ * New upstream release 2.6.17.7.
+ * Fix broken linux/futex.h with patch from Samuel
+ Thibault. closes: #381296.
+
+ -- Clint Adams <schizo@debian.org> Sat, 5 Aug 2006 18:23:58 -0400
+
linux-kernel-headers (2.6.17.6-1) unstable; urgency=low
* New upstream release 2.6.17.6.
Added: linux-kernel-headers/trunk/debian/patches/asm-generic-bitops-fls64.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/asm-generic-bitops-fls64.patch (rev 0)
+++ linux-kernel-headers/trunk/debian/patches/asm-generic-bitops-fls64.patch 2006-09-07 17:27:59 UTC (rev 1801)
@@ -0,0 +1,12 @@
+Index: linux-kernel-headers-2.6.17.8/include/asm-generic/bitops/fls64.h
+===================================================================
+--- linux-kernel-headers-2.6.17.8.orig/include/asm-generic/bitops/fls64.h 2006-08-15 00:34:02.156301269 -0400
++++ linux-kernel-headers-2.6.17.8/include/asm-generic/bitops/fls64.h 2006-08-15 00:34:11.585264450 -0400
+@@ -2,6 +2,7 @@
+ #define _ASM_GENERIC_BITOPS_FLS64_H_
+
+ #include <asm/types.h>
++#include <asm-generic/bitops/fls.h>
+
+ static inline int fls64(__u64 x)
+ {
Added: linux-kernel-headers/trunk/debian/patches/asm-generic-div64.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/asm-generic-div64.patch (rev 0)
+++ linux-kernel-headers/trunk/debian/patches/asm-generic-div64.patch 2006-09-07 17:27:59 UTC (rev 1801)
@@ -0,0 +1,64 @@
+Index: linux-kernel-headers-2.6.17.10/include/asm-generic/div64.h
+===================================================================
+--- linux-kernel-headers-2.6.17.10.orig/include/asm-generic/div64.h 2006-09-04 19:57:46.589724691 -0400
++++ linux-kernel-headers-2.6.17.10/include/asm-generic/div64.h 2006-09-04 19:57:58.778953325 -0400
+@@ -1,58 +1 @@
+-#ifndef _ASM_GENERIC_DIV64_H
+-#define _ASM_GENERIC_DIV64_H
+-/*
+- * Copyright (C) 2003 Bernardo Innocenti <bernie@develer.com>
+- * Based on former asm-ppc/div64.h and asm-m68knommu/div64.h
+- *
+- * The semantics of do_div() are:
+- *
+- * uint32_t do_div(uint64_t *n, uint32_t base)
+- * {
+- * uint32_t remainder = *n % base;
+- * *n = *n / base;
+- * return remainder;
+- * }
+- *
+- * NOTE: macro parameter n is evaluated multiple times,
+- * beware of side effects!
+- */
+-
+-#include <linux/types.h>
+-#include <linux/compiler.h>
+-
+-#if BITS_PER_LONG == 64
+-
+-# define do_div(n,base) ({ \
+- uint32_t __base = (base); \
+- uint32_t __rem; \
+- __rem = ((uint64_t)(n)) % __base; \
+- (n) = ((uint64_t)(n)) / __base; \
+- __rem; \
+- })
+-
+-#elif BITS_PER_LONG == 32
+-
+-extern uint32_t __div64_32(uint64_t *dividend, uint32_t divisor);
+-
+-/* The unnecessary pointer compare is there
+- * to check for type safety (n must be 64bit)
+- */
+-# define do_div(n,base) ({ \
+- uint32_t __base = (base); \
+- uint32_t __rem; \
+- (void)(((typeof((n)) *)0) == ((uint64_t *)0)); \
+- if (likely(((n) >> 32) == 0)) { \
+- __rem = (uint32_t)(n) % __base; \
+- (n) = (uint32_t)(n) / __base; \
+- } else \
+- __rem = __div64_32(&(n), __base); \
+- __rem; \
+- })
+-
+-#else /* BITS_PER_LONG == ?? */
+-
+-# error do_div() does not yet support the C64
+-
+-#endif /* BITS_PER_LONG */
+-
+-#endif /* _ASM_GENERIC_DIV64_H */
++#error Do not include div64.h.
Added: linux-kernel-headers/trunk/debian/patches/linux-futex.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/linux-futex.patch (rev 0)
+++ linux-kernel-headers/trunk/debian/patches/linux-futex.patch 2006-09-07 17:27:59 UTC (rev 1801)
@@ -0,0 +1,32 @@
+Index: linux-kernel-headers-2.6.17.7/include/linux/futex.h
+===================================================================
+--- linux-kernel-headers-2.6.17.7.orig/include/linux/futex.h 2006-08-05 18:30:41.000000000 -0400
++++ linux-kernel-headers-2.6.17.7/include/linux/futex.h 2006-08-05 18:33:00.918199073 -0400
+@@ -1,7 +1,11 @@
+ #ifndef _LINUX_FUTEX_H
+ #define _LINUX_FUTEX_H
+
++#ifdef __KERNEL__
+ #include <linux/sched.h>
++#else
++#define __user
++#endif
+
+ /* Second argument to futex syscall */
+
+@@ -90,6 +94,7 @@
+ */
+ #define ROBUST_LIST_LIMIT 2048
+
++#ifdef __KERNEL__
+ long do_futex(unsigned long uaddr, int op, int val,
+ unsigned long timeout, unsigned long uaddr2, int val2,
+ int val3);
+@@ -103,6 +108,7 @@
+ {
+ }
+ #endif
++#endif
+
+ #define FUTEX_OP_SET 0 /* *(int *)UADDR2 = OPARG; */
+ #define FUTEX_OP_ADD 1 /* *(int *)UADDR2 += OPARG; */
Modified: linux-kernel-headers/trunk/debian/patches/linux-joystick.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/linux-joystick.patch 2006-08-30 07:29:10 UTC (rev 1800)
+++ linux-kernel-headers/trunk/debian/patches/linux-joystick.patch 2006-09-07 17:27:59 UTC (rev 1801)
@@ -1,8 +1,17 @@
-Index: linux-kernel-headers-2.6.17.6/include/linux/joystick.h
+Index: linux-kernel-headers-2.6.17.10/include/linux/joystick.h
===================================================================
---- linux-kernel-headers-2.6.17.6.orig/include/linux/joystick.h 2006-07-23 02:00:49.000000000 -0400
-+++ linux-kernel-headers-2.6.17.6/include/linux/joystick.h 2006-07-23 02:01:39.671675343 -0400
-@@ -117,19 +117,19 @@
+--- linux-kernel-headers-2.6.17.10.orig/include/linux/joystick.h 2006-08-22 15:09:35.000000000 -0400
++++ linux-kernel-headers-2.6.17.10/include/linux/joystick.h 2006-09-07 11:57:01.934792426 -0400
+@@ -111,25 +111,25 @@
+ #define JS_SET_ALL 8
+
+ struct JS_DATA_TYPE {
+- int32_t buttons;
+- int32_t x;
+- int32_t y;
++ __s32 buttons;
++ __s32 x;
++ __s32 y;
};
struct JS_DATA_SAVE_TYPE_32 {
Modified: linux-kernel-headers/trunk/debian/patches/series
===================================================================
--- linux-kernel-headers/trunk/debian/patches/series 2006-08-30 07:29:10 UTC (rev 1800)
+++ linux-kernel-headers/trunk/debian/patches/series 2006-09-07 17:27:59 UTC (rev 1801)
@@ -34,3 +34,6 @@
asm-powerpc-unaligned.patch
#linux-input-input_device.patch
linux-joystick.patch
+linux-futex.patch
+asm-generic-bitops-fls64.patch
+asm-generic-div64.patch
Reply to: