* [PATCH 1/2] byteorder: add a new include/linux/swab.h to define byteswapping functions
@ 2008-08-09 23:23 Harvey Harrison
2008-08-30 12:36 ` Hans Verkuil
0 siblings, 1 reply; 6+ messages in thread
From: Harvey Harrison @ 2008-08-09 23:23 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML
Collect the implementations from include/linux/byteorder/swab.h, swabb.h
in swab.h
The functionality provided covers:
u16 swab16(u16 val) - return a byteswapped 16 bit value
u32 swab32(u32 val) - return a byteswapped 32 bit value
u64 swab64(u64 val) - return a byteswapped 64 bit value
u32 swahw32(u32 val) - return a wordswapped 32 bit value
u32 swahb32(u32 val) - return a high/low byteswapped 32 bit value
Similar to above, but return swapped value from a naturally-aligned pointer
u16 swab16p(u16 *p)
u32 swab32p(u32 *p)
u64 swab64p(u64 *p)
u32 swahw32p(u32 *p)
u32 swahb32p(u32 *p)
Similar to above, but swap the value in-place (in-situ)
void swab16s(u16 *p)
void swab32s(u32 *p)
void swab64s(u64 *p)
void swahw32s(u32 *p)
void swahb32s(u32 *p)
Arches can override any of these with an optimized version by defining an
inline in their asm/byteorder.h (example given for swab16()):
u16 __arch_swab16() {}
#define __arch_swab16 __arch_swab16
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
Linus, please apply so I can start getting each arch moved over to the
consolidated implementation. This is an opt-in process to avoid breakage,
the old implementation will be removed _after_ all arches have moved over.
include/linux/swab.h | 309 ++++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 309 insertions(+), 0 deletions(-)
diff --git a/include/linux/swab.h b/include/linux/swab.h
new file mode 100644
index 0000000..270d5c2
--- /dev/null
+++ b/include/linux/swab.h
@@ -0,0 +1,309 @@
+#ifndef _LINUX_SWAB_H
+#define _LINUX_SWAB_H
+
+#include <linux/types.h>
+#include <linux/compiler.h>
+#include <asm/byteorder.h>
+
+/*
+ * casts are necessary for constants, because we never know how for sure
+ * how U/UL/ULL map to __u16, __u32, __u64. At least not in a portable way.
+ */
+#define __const_swab16(x) ((__u16)( \
+ (((__u16)(x) & (__u16)0x00ffU) << 8) | \
+ (((__u16)(x) & (__u16)0xff00U) >> 8)))
+
+#define __const_swab32(x) ((__u32)( \
+ (((__u32)(x) & (__u32)0x000000ffUL) << 24) | \
+ (((__u32)(x) & (__u32)0x0000ff00UL) << 8) | \
+ (((__u32)(x) & (__u32)0x00ff0000UL) >> 8) | \
+ (((__u32)(x) & (__u32)0xff000000UL) >> 24)))
+
+#define __const_swab64(x) ((__u64)( \
+ (((__u64)(x) & (__u64)0x00000000000000ffULL) << 56) | \
+ (((__u64)(x) & (__u64)0x000000000000ff00ULL) << 40) | \
+ (((__u64)(x) & (__u64)0x0000000000ff0000ULL) << 24) | \
+ (((__u64)(x) & (__u64)0x00000000ff000000ULL) << 8) | \
+ (((__u64)(x) & (__u64)0x000000ff00000000ULL) >> 8) | \
+ (((__u64)(x) & (__u64)0x0000ff0000000000ULL) >> 24) | \
+ (((__u64)(x) & (__u64)0x00ff000000000000ULL) >> 40) | \
+ (((__u64)(x) & (__u64)0xff00000000000000ULL) >> 56)))
+
+#define __const_swahw32(x) ((__u32)( \
+ (((__u32)(x) & (__u32)0x0000ffffUL) << 16) | \
+ (((__u32)(x) & (__u32)0xffff0000UL) >> 16)))
+
+#define __const_swahb32(x) ((__u32)( \
+ (((__u32)(x) & (__u32)0x00ff00ffUL) << 8) | \
+ (((__u32)(x) & (__u32)0xff00ff00UL) >> 8)))
+
+/*
+ * Implement the following as inlines, but define the interface using
+ * macros to allow constant folding when possible:
+ * ___swab16, ___swab32, ___swab64, ___swahw32, ___swahb32
+ */
+
+static inline __attribute_const__ __u16 ___swab16(__u16 val)
+{
+#ifdef __arch_swab16
+ return __arch_swab16(val);
+#elif defined(__arch_swab16p)
+ return __arch_swab16p(&val);
+#else
+ return __const_swab16(val);
+#endif
+}
+
+static inline __attribute_const__ __u32 ___swab32(__u32 val)
+{
+#ifdef __arch_swab32
+ return __arch_swab32(val);
+#elif defined(__arch_swab32p)
+ return __arch_swab32p(&val);
+#else
+ return __const_swab32(val);
+#endif
+}
+
+static inline __attribute_const__ __u64 ___swab64(__u64 val)
+{
+#ifdef __arch_swab64
+ return __arch_swab64(val);
+#elif defined(__arch_swab64p)
+ return __arch_swab64p(&val);
+#elif defined(__SWAB_64_THRU_32__)
+ __u32 h = val >> 32;
+ __u32 l = val & ((1ULL << 32) - 1);
+ return (((__u64)___swab32(l)) << 32) | ((__u64)(___swab32(h)));
+#else
+ return __const_swab64(val);
+#endif
+}
+
+static inline __attribute_const__ __u32 ___swahw32(__u32 val)
+{
+#ifdef __arch_swahw32
+ return __arch_swahw32(val);
+#elif defined(__arch_swahw32p)
+ return __arch_swahw32p(&val);
+#else
+ return __const_swahw32(val);
+#endif
+}
+
+static inline __attribute_const__ __u32 ___swahb32(__u32 val)
+{
+#ifdef __arch_swahb32
+ return __arch_swahb32(val);
+#elif defined(__arch_swahb32p)
+ return __arch_swahb32p(&val);
+#else
+ return __const_swahb32(val);
+#endif
+}
+
+/**
+ * __swab16 - return a byteswapped 16-bit value
+ * @x: value to byteswap
+ */
+#define __swab16(x) \
+ (__builtin_constant_p((__u16)(x)) ? \
+ __const_swab16((x)) : \
+ ___swab16((x)))
+
+/**
+ * __swab32 - return a byteswapped 32-bit value
+ * @x: value to byteswap
+ */
+#define __swab32(x) \
+ (__builtin_constant_p((__u32)(x)) ? \
+ __const_swab32((x)) : \
+ ___swab32((x)))
+
+/**
+ * __swab64 - return a byteswapped 64-bit value
+ * @x: value to byteswap
+ */
+#define __swab64(x) \
+ (__builtin_constant_p((__u64)(x)) ? \
+ __const_swab64((x)) : \
+ ___swab64((x)))
+
+/**
+ * __swahw32 - return a word-swapped 32-bit value
+ * @x: value to wordswap
+ *
+ * __swahw32(0x12340000) is 0x00001234
+ */
+#define __swahw32(x) \
+ (__builtin_constant_p((__u32)(x)) ? \
+ __const_swahw32((x)) : \
+ ___swahw32((x)))
+
+/**
+ * __swahb32 - return a high and low byte-swapped 32-bit value
+ * @x: value to byteswap
+ *
+ * __swahb32(0x12345678) is 0x34127856
+ */
+#define __swahb32(x) \
+ (__builtin_constant_p((__u32)(x)) ? \
+ __const_swahb32((x)) : \
+ ___swahb32((x)))
+
+/**
+ * __swab16p - return a byteswapped 16-bit value from a pointer
+ * @p: pointer to a naturally-aligned 16-bit value
+ */
+static inline __u16 __swab16p(const __u16 *p)
+{
+#ifdef __arch_swab16p
+ return __arch_swab16p(p);
+#else
+ return __swab16(*p);
+#endif
+}
+
+/**
+ * __swab32p - return a byteswapped 32-bit value from a pointer
+ * @p: pointer to a naturally-aligned 32-bit value
+ */
+static inline __u32 __swab32p(const __u32 *p)
+{
+#ifdef __arch_swab32p
+ return __arch_swab32p(p);
+#else
+ return __swab32(*p);
+#endif
+}
+
+/**
+ * __swab64p - return a byteswapped 64-bit value from a pointer
+ * @p: pointer to a naturally-aligned 64-bit value
+ */
+static inline __u64 __swab64p(const __u64 *p)
+{
+#ifdef __arch_swab64p
+ return __arch_swab64p(p);
+#else
+ return __swab64(*p);
+#endif
+}
+
+/**
+ * __swahw32p - return a wordswapped 32-bit value from a pointer
+ * @p: pointer to a naturally-aligned 32-bit value
+ *
+ * See __swahw32() for details of wordswapping.
+ */
+static inline __u32 __swahw32p(const __u32 *p)
+{
+#ifdef __arch_swahw32p
+ return __arch_swahw32p(p);
+#else
+ return __swahw32(*p);
+#endif
+}
+
+/**
+ * __swahb32p - return a high and low byteswapped 32-bit value from a pointer
+ * @p: pointer to a naturally-aligned 32-bit value
+ *
+ * See __swahb32() for details of high/low byteswapping.
+ */
+static inline __u32 __swahb32p(const __u32 *p)
+{
+#ifdef __arch_swahb32p
+ return __arch_swahb32p(p);
+#else
+ return __swahb32(*p);
+#endif
+}
+
+/**
+ * __swab16s - byteswap a 16-bit value in-place
+ * @p: pointer to a naturally-aligned 16-bit value
+ */
+static inline void __swab16s(__u16 *p)
+{
+#ifdef __arch_swab16s
+ __arch_swab16s(p);
+#else
+ *p = __swab16p(p);
+#endif
+}
+/**
+ * __swab32s - byteswap a 32-bit value in-place
+ * @p: pointer to a naturally-aligned 32-bit value
+ */
+static inline void __swab32s(__u32 *p)
+{
+#ifdef __arch_swab32s
+ __arch_swab32s(p);
+#else
+ *p = __swab32p(p);
+#endif
+}
+
+/**
+ * __swab64s - byteswap a 64-bit value in-place
+ * @p: pointer to a naturally-aligned 64-bit value
+ */
+static inline void __swab64s(__u64 *p)
+{
+#ifdef __arch_swab64s
+ __arch_swab64s(p);
+#else
+ *p = __swab64p(p);
+#endif
+}
+
+/**
+ * __swahw32s - wordswap a 32-bit value in-place
+ * @p: pointer to a naturally-aligned 32-bit value
+ *
+ * See __swahw32() for details of wordswapping
+ */
+static inline void __swahw32s(__u32 *p)
+{
+#ifdef __arch_swahw32s
+ __arch_swahw32s(p);
+#else
+ *p = __swahw32p(p);
+#endif
+}
+
+/**
+ * __swahb32s - high and low byteswap a 32-bit value in-place
+ * @p: pointer to a naturally-aligned 32-bit value
+ *
+ * See __swahb32() for details of high and low byte swapping
+ */
+static inline void __swahb32s(__u32 *p)
+{
+#ifdef __arch_swahb32s
+ __arch_swahb32s(p);
+#else
+ *p = __swahb32p(p);
+#endif
+}
+
+#ifdef __KERNEL__
+# define swab16 __swab16
+# define swab32 __swab32
+# define swab64 __swab64
+# define swahw32 __swahw32
+# define swahb32 __swahb32
+# define swab16p __swab16p
+# define swab32p __swab32p
+# define swab64p __swab64p
+# define swahw32p __swahw32p
+# define swahb32p __swahb32p
+# define swab16s __swab16s
+# define swab32s __swab32s
+# define swab64s __swab64s
+# define swahw32s __swahw32s
+# define swahb32s __swahb32s
+#endif /* __KERNEL__ */
+
+#endif /* _LINUX_SWAB_H */
--
1.6.0.rc1.278.g9c632
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] byteorder: add a new include/linux/swab.h to define byteswapping functions
2008-08-09 23:23 [PATCH 1/2] byteorder: add a new include/linux/swab.h to define byteswapping functions Harvey Harrison
@ 2008-08-30 12:36 ` Hans Verkuil
2008-09-02 18:35 ` Harvey Harrison
0 siblings, 1 reply; 6+ messages in thread
From: Hans Verkuil @ 2008-08-30 12:36 UTC (permalink / raw)
To: Harvey Harrison; +Cc: Linus Torvalds, LKML, v4l, Mauro Carvalho Chehab
Hi Harvey,
On Sunday 10 August 2008 01:23:17 Harvey Harrison wrote:
> Collect the implementations from include/linux/byteorder/swab.h,
> swabb.h in swab.h
>
> The functionality provided covers:
> u16 swab16(u16 val) - return a byteswapped 16 bit value
> u32 swab32(u32 val) - return a byteswapped 32 bit value
> u64 swab64(u64 val) - return a byteswapped 64 bit value
> u32 swahw32(u32 val) - return a wordswapped 32 bit value
> u32 swahb32(u32 val) - return a high/low byteswapped 32 bit value
>
> Similar to above, but return swapped value from a naturally-aligned
> pointer u16 swab16p(u16 *p)
> u32 swab32p(u32 *p)
> u64 swab64p(u64 *p)
> u32 swahw32p(u32 *p)
> u32 swahb32p(u32 *p)
>
> Similar to above, but swap the value in-place (in-situ)
> void swab16s(u16 *p)
> void swab32s(u32 *p)
> void swab64s(u64 *p)
> void swahw32s(u32 *p)
> void swahb32s(u32 *p)
>
> Arches can override any of these with an optimized version by
> defining an inline in their asm/byteorder.h (example given for
> swab16()):
>
> u16 __arch_swab16() {}
> #define __arch_swab16 __arch_swab16
>
> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
> ---
> Linus, please apply so I can start getting each arch moved over to
> the consolidated implementation. This is an opt-in process to avoid
> breakage, the old implementation will be removed _after_ all arches
> have moved over.
>
Now that this is merged into 2.6.27-rc5 I'm getting broken builds for
linux/drivers/media/dvb/ttpci/av7110.c. It includes
<linux/byteorder/swabb.h>. Building on the arm gives this error:
In file included from /marune/build/v4l-dvb/v4l/av7110.c:39:
include/linux/byteorder/swabb.h:82:1: warning: "__swahw32" redefined
In file included from include/linux/byteorder.h:5,
from /marune/build/trees/armv5-ixp/linux-2.6.27-rc5/arch/arm/include/asm/byteorder.h:53,
from include/linux/kernel.h:19,
from include/linux/cache.h:4,
from include/linux/time.h:7,
from include/linux/stat.h:60,
from include/linux/module.h:10,
from /marune/build/v4l-dvb/v4l/av7110.c:33:
include/linux/swab.h:138:1: warning: this is the location of the
previous definition
In file included from /marune/build/v4l-dvb/v4l/av7110.c:39:
include/linux/byteorder/swabb.h:86:1: warning: "__swahb32" redefined
In file included from include/linux/byteorder.h:5,
from /marune/build/trees/armv5-ixp/linux-2.6.27-rc5/arch/arm/include/asm/byteorder.h:53,
from include/linux/kernel.h:19,
from include/linux/cache.h:4,
from include/linux/time.h:7,
from include/linux/stat.h:60,
from include/linux/module.h:10,
from /marune/build/v4l-dvb/v4l/av7110.c:33:
include/linux/swab.h:149:1: warning: this is the location of the
previous definition
In file included from /marune/build/v4l-dvb/v4l/av7110.c:39:
include/linux/byteorder/swabb.h:97: error: conflicting types
for '__swahw32p'
include/linux/swab.h:200: error: previous definition of '__swahw32p' was
here
include/linux/byteorder/swabb.h:102: error: redefinition of '__swahw32s'
include/linux/swab.h:268: error: previous definition of '__swahw32s' was
here
include/linux/byteorder/swabb.h:112: error: conflicting types
for '__swahb32p'
include/linux/swab.h:215: error: previous definition of '__swahb32p' was
here
include/linux/byteorder/swabb.h:117: error: redefinition of '__swahb32s'
include/linux/swab.h:283: error: previous definition of '__swahb32s' was
here
CC [M] /marune/build/v4l-dvb/v4l/af9005-remote.o
CC [M] /marune/build/v4l-dvb/v4l/af9005.o
make[3]: *** [/marune/build/v4l-dvb/v4l/av7110.o] Error 1
make[3]: *** Waiting for unfinished jobs....
make[2]: *** [_module_/marune/build/v4l-dvb/v4l] Error 2
make[2]: Leaving directory
`/marune/build/trees/armv5-ixp/linux-2.6.27-rc5'
make[1]: *** [default] Error 2
make[1]: Leaving directory `/marune/build/v4l-dvb/v4l'
make: *** [all] Error 2
If I replace byteorder/swabb.h with <linux/swab.h> then the arm
compiles, but I get these compile errors for i686, powerpc64 and
x86_64:
In file included from /marune/build/v4l-dvb/v4l/av7110.c:40:
include/linux/swab.h:46: error: redefinition of '___swab16'
include/linux/byteorder/swab.h:65: error: previous definition
of '___swab16' was here
include/linux/swab.h:57: error: redefinition of '___swab32'
include/linux/byteorder/swab.h:69: error: previous definition
of '___swab32' was here
include/linux/swab.h:68: error: redefinition of '___swab64'
include/linux/byteorder/swab.h:75: error: previous definition
of '___swab64' was here
In file included from /marune/build/v4l-dvb/v4l/av7110.c:40:
include/linux/swab.h:109:1: warning: "__swab16" redefined
In file included from include/linux/byteorder/little_endian.h:12,
from include/asm/byteorder.h:79,
from include/asm-generic/bitops/le.h:5,
from include/asm-generic/bitops/ext2-non-atomic.h:4,
from include/asm/bitops.h:451,
from include/linux/bitops.h:17,
from include/linux/kernel.h:15,
from include/linux/cache.h:4,
from include/asm/pda.h:7,
from include/asm/current.h:19,
from include/asm/processor.h:15,
from include/linux/prefetch.h:14,
from include/linux/list.h:6,
from include/linux/module.h:9,
from /marune/build/v4l-dvb/v4l/av7110.c:33:
include/linux/byteorder/swab.h:144:1: warning: this is the location of
the previous definition
In file included from /marune/build/v4l-dvb/v4l/av7110.c:40:
include/linux/swab.h:118:1: warning: "__swab32" redefined
In file included from include/linux/byteorder/little_endian.h:12,
from include/asm/byteorder.h:79,
from include/asm-generic/bitops/le.h:5,
from include/asm-generic/bitops/ext2-non-atomic.h:4,
from include/asm/bitops.h:451,
from include/linux/bitops.h:17,
from include/linux/kernel.h:15,
from include/linux/cache.h:4,
from include/asm/pda.h:7,
from include/asm/current.h:19,
from include/asm/processor.h:15,
from include/linux/prefetch.h:14,
from include/linux/list.h:6,
from include/linux/module.h:9,
from /marune/build/v4l-dvb/v4l/av7110.c:33:
include/linux/byteorder/swab.h:148:1: warning: this is the location of
the previous definition
In file included from /marune/build/v4l-dvb/v4l/av7110.c:40:
include/linux/swab.h:127:1: warning: "__swab64" redefined
In file included from include/linux/byteorder/little_endian.h:12,
from include/asm/byteorder.h:79,
from include/asm-generic/bitops/le.h:5,
from include/asm-generic/bitops/ext2-non-atomic.h:4,
from include/asm/bitops.h:451,
from include/linux/bitops.h:17,
from include/linux/kernel.h:15,
from include/linux/cache.h:4,
from include/asm/pda.h:7,
from include/asm/current.h:19,
from include/asm/processor.h:15,
from include/linux/prefetch.h:14,
from include/linux/list.h:6,
from include/linux/module.h:9,
from /marune/build/v4l-dvb/v4l/av7110.c:33:
include/linux/byteorder/swab.h:152:1: warning: this is the location of
the previous definition
include/linux/swab.h:158: error: redefinition of '__swab16p'
include/linux/byteorder/swab.h:168: error: previous definition
of '__swab16p' was here
include/linux/swab.h:171: error: redefinition of '__swab32p'
include/linux/byteorder/swab.h:181: error: previous definition
of '__swab32p' was here
include/linux/swab.h:184: error: redefinition of '__swab64p'
include/linux/byteorder/swab.h:201: error: previous definition
of '__swab64p' was here
include/linux/swab.h:227: error: redefinition of '__swab16s'
include/linux/byteorder/swab.h:172: error: previous definition
of '__swab16s' was here
include/linux/swab.h:239: error: redefinition of '__swab32s'
include/linux/byteorder/swab.h:185: error: previous definition
of '__swab32s' was here
include/linux/swab.h:252: error: redefinition of '__swab64s'
include/linux/byteorder/swab.h:205: error: previous definition
of '__swab64s' was here
Can you take a look at this? My daily v4l-dvb build fails because of
this.
Thanks,
Hans
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 1/2] byteorder: add a new include/linux/swab.h to define byteswapping functions
2008-08-30 12:36 ` Hans Verkuil
@ 2008-09-02 18:35 ` Harvey Harrison
2008-09-02 18:50 ` [BUILDFIX] byteorder: remove direct byteorder includes Harvey Harrison
0 siblings, 1 reply; 6+ messages in thread
From: Harvey Harrison @ 2008-09-02 18:35 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Linus Torvalds, LKML, v4l, Mauro Carvalho Chehab
From: Harvey Harrison <harvey.harrison@gmail.com>
Subject: [buildfix-PATCH] byteorder: remove direct includes of linux/byteorder/swabb.h
All of the functionality has been collected in linux/swab.h
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
drivers/media/dvb/ttpci/av7110.c | 2 +-
kernel/rcupreempt.c | 2 +-
tests/rcutorture.c | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index c0a1746..792a175 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -36,7 +36,7 @@
#include <linux/fs.h>
#include <linux/timer.h>
#include <linux/poll.h>
-#include <linux/byteorder/swabb.h>
+#include <linux/swab.h>
#include <linux/smp_lock.h>
#include <linux/kernel.h>
diff --git a/kernel/rcupreempt.c b/kernel/rcupreempt.c
index ca4bbbe..494d0e8 100644
--- a/kernel/rcupreempt.c
+++ b/kernel/rcupreempt.c
@@ -54,7 +54,7 @@
#include <linux/cpu.h>
#include <linux/random.h>
#include <linux/delay.h>
-#include <linux/byteorder/swabb.h>
+#include <linux/swab.h>
#include <linux/cpumask.h>
#include <linux/rcupreempt_trace.h>
diff --git a/tests/rcutorture.c b/tests/rcutorture.c
index 90b5b12..67856af 100644
--- a/tests/rcutorture.c
+++ b/tests/rcutorture.c
@@ -42,7 +42,7 @@
#include <linux/freezer.h>
#include <linux/cpu.h>
#include <linux/delay.h>
-#include <linux/byteorder/swabb.h>
+#include <linux/swab.h>
#include <linux/stat.h>
#include <linux/srcu.h>
#include <linux/slab.h>
--
1.6.0.1.400.ga23d3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [BUILDFIX] byteorder: remove direct byteorder includes
2008-09-02 18:35 ` Harvey Harrison
@ 2008-09-02 18:50 ` Harvey Harrison
2008-09-02 19:42 ` Hans Verkuil
0 siblings, 1 reply; 6+ messages in thread
From: Harvey Harrison @ 2008-09-02 18:50 UTC (permalink / raw)
To: Hans Verkuil; +Cc: Linus Torvalds, LKML, v4l, Mauro Carvalho Chehab
All of the functionality has been collected in linux/swab.h
Needed to prevent build brakage as arches start moving over
to the new byteorder implementation.
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
Sorry, I only sent you half-a-patch in my last message, this is the
full patch needed.
drivers/media/dvb/ttpci/av7110.c | 2 +-
drivers/media/video/cx18/cx18-driver.h | 2 +-
drivers/media/video/ivtv/ivtv-driver.h | 2 +-
drivers/media/video/vpx3220.c | 2 +-
kernel/rcupreempt.c | 2 +-
tests/rcutorture.c | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/drivers/media/dvb/ttpci/av7110.c
b/drivers/media/dvb/ttpci/av7110.c
index c0a1746..792a175 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -36,7 +36,7 @@
#include <linux/fs.h>
#include <linux/timer.h>
#include <linux/poll.h>
-#include <linux/byteorder/swabb.h>
+#include <linux/swab.h>
#include <linux/smp_lock.h>
#include <linux/kernel.h>
diff --git a/drivers/media/video/cx18/cx18-driver.h
b/drivers/media/video/cx18/cx18-driver.h
index 2635989..8787a5f 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -38,7 +38,7 @@
#include <linux/i2c-algo-bit.h>
#include <linux/list.h>
#include <linux/unistd.h>
-#include <linux/byteorder/swab.h>
+#include <linux/swab.h>
#include <linux/pagemap.h>
#include <linux/workqueue.h>
#include <linux/mutex.h>
diff --git a/drivers/media/video/ivtv/ivtv-driver.h
b/drivers/media/video/ivtv/ivtv-driver.h
index 2ceb522..2213473 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -49,7 +49,7 @@
#include <linux/i2c-algo-bit.h>
#include <linux/list.h>
#include <linux/unistd.h>
-#include <linux/byteorder/swab.h>
+#include <linux/swab.h>
#include <linux/pagemap.h>
#include <linux/scatterlist.h>
#include <linux/workqueue.h>
diff --git a/drivers/media/video/vpx3220.c
b/drivers/media/video/vpx3220.c
index 3529302..6828411 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -24,7 +24,7 @@
#include <linux/types.h>
#include <linux/slab.h>
-#include <linux/byteorder/swab.h>
+#include <linux/swab.h>
#include <asm/io.h>
#include <asm/uaccess.h>
diff --git a/kernel/rcupreempt.c b/kernel/rcupreempt.c
index ca4bbbe..494d0e8 100644
--- a/kernel/rcupreempt.c
+++ b/kernel/rcupreempt.c
@@ -54,7 +54,7 @@
#include <linux/cpu.h>
#include <linux/random.h>
#include <linux/delay.h>
-#include <linux/byteorder/swabb.h>
+#include <linux/swab.h>
#include <linux/cpumask.h>
#include <linux/rcupreempt_trace.h>
diff --git a/tests/rcutorture.c b/tests/rcutorture.c
index 90b5b12..67856af 100644
--- a/tests/rcutorture.c
+++ b/tests/rcutorture.c
@@ -42,7 +42,7 @@
#include <linux/freezer.h>
#include <linux/cpu.h>
#include <linux/delay.h>
-#include <linux/byteorder/swabb.h>
+#include <linux/swab.h>
#include <linux/stat.h>
#include <linux/srcu.h>
#include <linux/slab.h>
--
1.6.0.1.400.ga23d3
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [BUILDFIX] byteorder: remove direct byteorder includes
2008-09-02 18:50 ` [BUILDFIX] byteorder: remove direct byteorder includes Harvey Harrison
@ 2008-09-02 19:42 ` Hans Verkuil
2008-09-02 23:11 ` Harvey Harrison
0 siblings, 1 reply; 6+ messages in thread
From: Hans Verkuil @ 2008-09-02 19:42 UTC (permalink / raw)
To: Harvey Harrison; +Cc: Linus Torvalds, LKML, v4l, Mauro Carvalho Chehab
Hi Harvey,
On Tuesday 02 September 2008 20:50:00 Harvey Harrison wrote:
> All of the functionality has been collected in linux/swab.h
>
> Needed to prevent build brakage as arches start moving over
> to the new byteorder implementation.
1) With this patch the i686, x86_64 and powerpc64 build fail on
av7110.c, as I said in my original mail. Do you have additional patches
that address this?
2) For the cx18, ivtv and vpx3220 please just remove the swabb.h
include: it's either not really needed or included through another
include. The v4l-dvb master repository has been updated to just remove
these linux/byteorder/swabb.h includes in these three sources.
Regards,
Hans
> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
> ---
> Sorry, I only sent you half-a-patch in my last message, this is the
> full patch needed.
>
> drivers/media/dvb/ttpci/av7110.c | 2 +-
> drivers/media/video/cx18/cx18-driver.h | 2 +-
> drivers/media/video/ivtv/ivtv-driver.h | 2 +-
> drivers/media/video/vpx3220.c | 2 +-
> kernel/rcupreempt.c | 2 +-
> tests/rcutorture.c | 2 +-
> 6 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/media/dvb/ttpci/av7110.c
> b/drivers/media/dvb/ttpci/av7110.c
> index c0a1746..792a175 100644
> --- a/drivers/media/dvb/ttpci/av7110.c
> +++ b/drivers/media/dvb/ttpci/av7110.c
> @@ -36,7 +36,7 @@
> #include <linux/fs.h>
> #include <linux/timer.h>
> #include <linux/poll.h>
> -#include <linux/byteorder/swabb.h>
> +#include <linux/swab.h>
> #include <linux/smp_lock.h>
>
> #include <linux/kernel.h>
> diff --git a/drivers/media/video/cx18/cx18-driver.h
> b/drivers/media/video/cx18/cx18-driver.h
> index 2635989..8787a5f 100644
> --- a/drivers/media/video/cx18/cx18-driver.h
> +++ b/drivers/media/video/cx18/cx18-driver.h
> @@ -38,7 +38,7 @@
> #include <linux/i2c-algo-bit.h>
> #include <linux/list.h>
> #include <linux/unistd.h>
> -#include <linux/byteorder/swab.h>
> +#include <linux/swab.h>
> #include <linux/pagemap.h>
> #include <linux/workqueue.h>
> #include <linux/mutex.h>
> diff --git a/drivers/media/video/ivtv/ivtv-driver.h
> b/drivers/media/video/ivtv/ivtv-driver.h
> index 2ceb522..2213473 100644
> --- a/drivers/media/video/ivtv/ivtv-driver.h
> +++ b/drivers/media/video/ivtv/ivtv-driver.h
> @@ -49,7 +49,7 @@
> #include <linux/i2c-algo-bit.h>
> #include <linux/list.h>
> #include <linux/unistd.h>
> -#include <linux/byteorder/swab.h>
> +#include <linux/swab.h>
> #include <linux/pagemap.h>
> #include <linux/scatterlist.h>
> #include <linux/workqueue.h>
> diff --git a/drivers/media/video/vpx3220.c
> b/drivers/media/video/vpx3220.c
> index 3529302..6828411 100644
> --- a/drivers/media/video/vpx3220.c
> +++ b/drivers/media/video/vpx3220.c
> @@ -24,7 +24,7 @@
> #include <linux/types.h>
> #include <linux/slab.h>
>
> -#include <linux/byteorder/swab.h>
> +#include <linux/swab.h>
>
> #include <asm/io.h>
> #include <asm/uaccess.h>
> diff --git a/kernel/rcupreempt.c b/kernel/rcupreempt.c
> index ca4bbbe..494d0e8 100644
> --- a/kernel/rcupreempt.c
> +++ b/kernel/rcupreempt.c
> @@ -54,7 +54,7 @@
> #include <linux/cpu.h>
> #include <linux/random.h>
> #include <linux/delay.h>
> -#include <linux/byteorder/swabb.h>
> +#include <linux/swab.h>
> #include <linux/cpumask.h>
> #include <linux/rcupreempt_trace.h>
>
> diff --git a/tests/rcutorture.c b/tests/rcutorture.c
> index 90b5b12..67856af 100644
> --- a/tests/rcutorture.c
> +++ b/tests/rcutorture.c
> @@ -42,7 +42,7 @@
> #include <linux/freezer.h>
> #include <linux/cpu.h>
> #include <linux/delay.h>
> -#include <linux/byteorder/swabb.h>
> +#include <linux/swab.h>
> #include <linux/stat.h>
> #include <linux/srcu.h>
> #include <linux/slab.h>
> --
> 1.6.0.1.400.ga23d3
>
>
>
> --
> To unsubscribe from this list: send the line "unsubscribe
linux-kernel" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
>
^ permalink raw reply [flat|nested] 6+ messages in thread
* [BUILDFIX] byteorder: remove direct byteorder includes
2008-09-02 19:42 ` Hans Verkuil
@ 2008-09-02 23:11 ` Harvey Harrison
0 siblings, 0 replies; 6+ messages in thread
From: Harvey Harrison @ 2008-09-02 23:11 UTC (permalink / raw)
To: Linus Torvalds; +Cc: LKML, v4l, Mauro Carvalho Chehab, Hans Verkuil
All of the functionality has been collected in linux/swab.h
Needed to prevent build breakage as arches start moving over
to the new byteorder implementation. Ensure that each implementation
offers all byte-swapping methods to avoid build breakage when only
some arches are converted.
Acked-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
---
Tested on a converted(ARM) and an unconverted(x86) arch.
drivers/media/dvb/ttpci/av7110.c | 2 +-
drivers/media/video/cx18/cx18-driver.h | 2 +-
drivers/media/video/ivtv/ivtv-driver.h | 2 +-
drivers/media/video/vpx3220.c | 3 +--
include/linux/byteorder/big_endian.h | 1 +
include/linux/byteorder/little_endian.h | 1 +
kernel/rcupreempt.c | 2 +-
tests/rcutorture.c | 2 +-
8 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/drivers/media/dvb/ttpci/av7110.c b/drivers/media/dvb/ttpci/av7110.c
index c0a1746..deb3829 100644
--- a/drivers/media/dvb/ttpci/av7110.c
+++ b/drivers/media/dvb/ttpci/av7110.c
@@ -36,7 +36,6 @@
#include <linux/fs.h>
#include <linux/timer.h>
#include <linux/poll.h>
-#include <linux/byteorder/swabb.h>
#include <linux/smp_lock.h>
#include <linux/kernel.h>
@@ -52,6 +51,7 @@
#include <linux/i2c.h>
#include <linux/kthread.h>
#include <asm/unaligned.h>
+#include <asm/byteorder.h>
#include <asm/system.h>
diff --git a/drivers/media/video/cx18/cx18-driver.h b/drivers/media/video/cx18/cx18-driver.h
index 2635989..bd94d77 100644
--- a/drivers/media/video/cx18/cx18-driver.h
+++ b/drivers/media/video/cx18/cx18-driver.h
@@ -38,10 +38,10 @@
#include <linux/i2c-algo-bit.h>
#include <linux/list.h>
#include <linux/unistd.h>
-#include <linux/byteorder/swab.h>
#include <linux/pagemap.h>
#include <linux/workqueue.h>
#include <linux/mutex.h>
+#include <asm/byteorder.h>
#include <linux/dvb/video.h>
#include <linux/dvb/audio.h>
diff --git a/drivers/media/video/ivtv/ivtv-driver.h b/drivers/media/video/ivtv/ivtv-driver.h
index 2ceb522..99c3e7a 100644
--- a/drivers/media/video/ivtv/ivtv-driver.h
+++ b/drivers/media/video/ivtv/ivtv-driver.h
@@ -49,11 +49,11 @@
#include <linux/i2c-algo-bit.h>
#include <linux/list.h>
#include <linux/unistd.h>
-#include <linux/byteorder/swab.h>
#include <linux/pagemap.h>
#include <linux/scatterlist.h>
#include <linux/workqueue.h>
#include <linux/mutex.h>
+#include <asm/byteorder.h>
#include <asm/uaccess.h>
#include <asm/system.h>
diff --git a/drivers/media/video/vpx3220.c b/drivers/media/video/vpx3220.c
index 3529302..256f77c 100644
--- a/drivers/media/video/vpx3220.c
+++ b/drivers/media/video/vpx3220.c
@@ -24,8 +24,7 @@
#include <linux/types.h>
#include <linux/slab.h>
-#include <linux/byteorder/swab.h>
-
+#include <asm/byteorder.h>
#include <asm/io.h>
#include <asm/uaccess.h>
diff --git a/include/linux/byteorder/big_endian.h b/include/linux/byteorder/big_endian.h
index 44f95b9..1cba3f3 100644
--- a/include/linux/byteorder/big_endian.h
+++ b/include/linux/byteorder/big_endian.h
@@ -10,6 +10,7 @@
#include <linux/types.h>
#include <linux/byteorder/swab.h>
+#include <linux/byteorder/swabb.h>
#define __constant_htonl(x) ((__force __be32)(__u32)(x))
#define __constant_ntohl(x) ((__force __u32)(__be32)(x))
diff --git a/include/linux/byteorder/little_endian.h b/include/linux/byteorder/little_endian.h
index 4cc170a..cedc1b5 100644
--- a/include/linux/byteorder/little_endian.h
+++ b/include/linux/byteorder/little_endian.h
@@ -10,6 +10,7 @@
#include <linux/types.h>
#include <linux/byteorder/swab.h>
+#include <linux/byteorder/swabb.h>
#define __constant_htonl(x) ((__force __be32)___constant_swab32((x)))
#define __constant_ntohl(x) ___constant_swab32((__force __be32)(x))
diff --git a/kernel/rcupreempt.c b/kernel/rcupreempt.c
index ca4bbbe..59236e8 100644
--- a/kernel/rcupreempt.c
+++ b/kernel/rcupreempt.c
@@ -54,9 +54,9 @@
#include <linux/cpu.h>
#include <linux/random.h>
#include <linux/delay.h>
-#include <linux/byteorder/swabb.h>
#include <linux/cpumask.h>
#include <linux/rcupreempt_trace.h>
+#include <asm/byteorder.h>
/*
* PREEMPT_RCU data structures.
diff --git a/tests/rcutorture.c b/tests/rcutorture.c
index 90b5b12..85cb905 100644
--- a/tests/rcutorture.c
+++ b/tests/rcutorture.c
@@ -42,10 +42,10 @@
#include <linux/freezer.h>
#include <linux/cpu.h>
#include <linux/delay.h>
-#include <linux/byteorder/swabb.h>
#include <linux/stat.h>
#include <linux/srcu.h>
#include <linux/slab.h>
+#include <asm/byteorder.h>
MODULE_LICENSE("GPL");
MODULE_AUTHOR("Paul E. McKenney <paulmck@us.ibm.com> and "
--
1.6.0.1.400.ga23d3
^ permalink raw reply related [flat|nested] 6+ messages in thread
end of thread, other threads:[~2008-09-02 23:11 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-08-09 23:23 [PATCH 1/2] byteorder: add a new include/linux/swab.h to define byteswapping functions Harvey Harrison
2008-08-30 12:36 ` Hans Verkuil
2008-09-02 18:35 ` Harvey Harrison
2008-09-02 18:50 ` [BUILDFIX] byteorder: remove direct byteorder includes Harvey Harrison
2008-09-02 19:42 ` Hans Verkuil
2008-09-02 23:11 ` Harvey Harrison
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).