r961 - in linux-kernel-headers/trunk/debian: . patches
Author: gotom
Date: 2005-07-22 06:40:15 +0000 (Fri, 22 Jul 2005)
New Revision: 961
Removed:
linux-kernel-headers/trunk/debian/patches/asm-ppc64-swab64.patch
linux-kernel-headers/trunk/debian/patches/i2c-dev.patch
Modified:
linux-kernel-headers/trunk/debian/changelog
linux-kernel-headers/trunk/debian/patches/byteorder-const.patch
linux-kernel-headers/trunk/debian/patches/usb.patch
Log:
- debian/patches/asm-ppc64-swab64.patch: Delete file, it's already applied
to upstream.
- debian/patches/i2c-dev.patch: Likewise.
- debian/patches/usb.patch: Remove usb_ch9.h part because it's already
applied to upstream. Fix new patch that introduced another breaks.
- debian/patches/byteorder-const.patch: Move asm-ppc64 part from
asm-ppc64-swab64.patch. Remove linux/byteorder/swabb.h part because
it's already applied to upstream.
Modified: linux-kernel-headers/trunk/debian/changelog
===================================================================
--- linux-kernel-headers/trunk/debian/changelog 2005-07-22 05:25:53 UTC (rev 960)
+++ linux-kernel-headers/trunk/debian/changelog 2005-07-22 06:40:15 UTC (rev 961)
@@ -11,6 +11,15 @@
- debian/generate-asm.sh: Install autoconf.h to asm* instead of linux
when biarch is used.
+ - debian/patches/asm-ppc64-swab64.patch: Delete file, it's already applied
+ to upstream.
+ - debian/patches/i2c-dev.patch: Likewise.
+ - debian/patches/usb.patch: Remove usb_ch9.h part because it's already
+ applied to upstream. Fix new patch that introduced another breaks.
+ - debian/patches/byteorder-const.patch: Move asm-ppc64 part from
+ asm-ppc64-swab64.patch. Remove linux/byteorder/swabb.h part because
+ it's already applied to upstream.
+
-- GOTO Masanori <gotom@debian.org> Sat, 2 Jul 2005 18:37:43 +0900
linux-kernel-headers (2.6.12.0-1) unstable; urgency=low
Deleted: linux-kernel-headers/trunk/debian/patches/asm-ppc64-swab64.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/asm-ppc64-swab64.patch 2005-07-22 05:25:53 UTC (rev 960)
+++ linux-kernel-headers/trunk/debian/patches/asm-ppc64-swab64.patch 2005-07-22 06:40:15 UTC (rev 961)
@@ -1,46 +0,0 @@
-2005-06-11 GOTO Masanori <gotom@debian.org>
-
- Enable ___arch__swab16, ___arch__swab32.
- Remove ___arch__swab64 because ppc64 does not have appropriate
- instruction for this purpose.
- Move byteorder-const.h ppc64 part to this file.
-
---- ../linux-2.6.12-rc6/include/asm-ppc64/byteorder.h 2005-06-07 00:22:29.000000000 +0900
-+++ include/asm-ppc64/byteorder.h 2005-06-13 00:57:52.150659216 +0900
-@@ -40,8 +40,7 @@
- __asm__ __volatile__ ("stwbrx %1,0,%2" : "=m" (*addr) : "r" (val), "r" (addr));
- }
-
--#if 0
--static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 value)
-+static __inline__ __u16 ___arch__swab16(__u16 value)
- {
- __u16 result;
-
-@@ -51,7 +50,7 @@
- return result;
- }
-
--static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 value)
-+static __inline__ __u32 ___arch__swab32(__u32 value)
- {
- __u32 result;
-
-@@ -63,17 +62,8 @@
- return result;
- }
-
--static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 value)
--{
-- __u64 result;
--#error implement me
--}
--
- #define __arch__swab16(x) ___arch__swab16(x)
- #define __arch__swab32(x) ___arch__swab32(x)
--#define __arch__swab64(x) ___arch__swab64(x)
--
--#endif
-
- /* The same, but returns converted value from the location pointer by addr. */
- #define __arch__swab16p(addr) ld_le16(addr)
Modified: linux-kernel-headers/trunk/debian/patches/byteorder-const.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/byteorder-const.patch 2005-07-22 05:25:53 UTC (rev 960)
+++ linux-kernel-headers/trunk/debian/patches/byteorder-const.patch 2005-07-22 06:40:15 UTC (rev 961)
@@ -1,5 +1,9 @@
+Update 2005-07-22 gotom.
+Enable asm-ppc64/byteorder.h patch again, moved from asm-ppc64-swab64.patch.
+Remove linux/byteorder/swabb.h part, it's already applied to upstream.
+
Update 2005-05-27 gotom.
-Disable asm-ppc64/byteorder.h patch, move it to asm-ppc64-swab64.h
+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
@@ -109,35 +113,26 @@
{
__u32 result;
-#--- include.orig/asm-ppc64/byteorder.h 2005-04-21 09:03:16.000000000 +0900
-#+++ include/asm-ppc64/byteorder.h 2005-05-27 21:44:08.589474205 +0900
-#@@ -41,7 +41,7 @@
-# }
-#
-# #if 0
-#-static __inline__ __attribute_const__ __u16 ___arch__swab16(__u16 value)
-#+static __inline__ __u16 ___arch__swab16(__u16 value)
-# {
-# __u16 result;
-#
-#@@ -51,7 +51,7 @@
-# return result;
-# }
-#
-#-static __inline__ __attribute_const__ __u32 ___arch__swab32(__u32 value)
-#+static __inline__ __u32 ___arch__swab32(__u32 value)
-# {
-# __u32 result;
-#
-#@@ -63,7 +63,7 @@
-# return result;
-# }
-#
-#-static __inline__ __attribute_const__ __u64 ___arch__swab64(__u64 value)
-#+static __inline__ __u64 ___arch__swab64(__u64 value)
-# {
-# __u64 result;
-# #error implement me
+--- include/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
@@ -8,7 +8,7 @@
@@ -244,23 +239,3 @@
{
# ifdef __SWAB_64_THRU_32__
__u32 h = x >> 32;
---- 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 */
-
-
--static __inline__ __const__ __u32 __fswahw32(__u32 x)
-+static __inline__ __u32 __fswahw32(__u32 x)
- {
- return __arch__swahw32(x);
- }
-@@ -106,7 +106,7 @@
- }
-
-
--static __inline__ __const__ __u32 __fswahb32(__u32 x)
-+static __inline__ __u32 __fswahb32(__u32 x)
- {
- return __arch__swahb32(x);
- }
Deleted: linux-kernel-headers/trunk/debian/patches/i2c-dev.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/i2c-dev.patch 2005-07-22 05:25:53 UTC (rev 960)
+++ linux-kernel-headers/trunk/debian/patches/i2c-dev.patch 2005-07-22 06:40:15 UTC (rev 961)
@@ -1,10 +0,0 @@
---- include/linux/i2c-dev.h.orig 2004-01-03 13:38:26.000000000 -0500
-+++ include/linux/i2c-dev.h 2004-01-03 13:38:38.000000000 -0500
-@@ -25,6 +25,7 @@
- #define _LINUX_I2C_DEV_H
-
- #include <linux/types.h>
-+#include <linux/compiler.h>
-
- /* Some IOCTL commands are defined in <linux/i2c.h> */
- /* Note: 10-bit addresses are NOT supported! */
Modified: linux-kernel-headers/trunk/debian/patches/usb.patch
===================================================================
--- linux-kernel-headers/trunk/debian/patches/usb.patch 2005-07-22 05:25:53 UTC (rev 960)
+++ linux-kernel-headers/trunk/debian/patches/usb.patch 2005-07-22 06:40:15 UTC (rev 961)
@@ -1,5 +1,9 @@
Fixes use of <linux/usb.h> from userspace.
+Update 2005-07-22 gotom, usb_ch9.h part is removed because it's
+already applied to upstream. New usb_ch9.h part is introduced
+because the latest header has another broken usage.
+
Update 2005-05-05 gotom, usb_ch9.h should include linux/types.h
instead of asm/types.h due to install __le16.
@@ -21,25 +25,22 @@
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
+--- include/linux/usb_ch9.h 2005-07-13 13:46:46.000000000 +0900
++++ include/linux/usb_ch9.h.gotom 2005-07-22 15:35:20.694654077 +0900
+@@ -401,7 +401,6 @@
--#include <asm/types.h> /* __u8 etc */
-+#include <linux/types.h> /* __u8 etc */
+ __u8 tTKID[3];
+ __u8 bReserved;
+- __u8 bKeyData[0];
+ };
/*-------------------------------------------------------------------------*/
+@@ -526,7 +525,7 @@
+ USB_SPEED_UNKNOWN = 0, /* enumerating */
+ USB_SPEED_LOW, USB_SPEED_FULL, /* usb 1.1 */
+ USB_SPEED_HIGH, /* usb 2.0 */
+- USB_SPEED_VARIABLE, /* wireless (usb 2.5) */
++ USB_SPEED_VARIABLE /* wireless (usb 2.5) */
+ };
-@@ -268,8 +268,8 @@
- __le16 wMaxPacketSize;
- __u8 bInterval;
-
-- // NOTE: these two are _only_ in audio endpoints.
-- // use USB_DT_ENDPOINT*_SIZE in bLength, not sizeof.
-+ /* NOTE: these two are _only_ in audio endpoints. */
-+ /* use USB_DT_ENDPOINT*_SIZE in bLength, not sizeof. */
- __u8 bRefresh;
- __u8 bSynchAddress;
- } __attribute__ ((packed));
+ enum usb_device_state {
Reply to: