2008-08-19 00:48:32

by Harvey Harrison

Subject: [PATCH 02/23] arm: use the new byteorder headers

Signed-off-by: Harvey Harrison <[email protected]>
---
arch/arm/include/asm/byteorder.h | 25 +++++++++++--------------
1 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/arch/arm/include/asm/byteorder.h b/arch/arm/include/asm/byteorder.h
index 4fbfb22..d04a7a2 100644
--- a/arch/arm/include/asm/byteorder.h
+++ b/arch/arm/include/asm/byteorder.h
@@ -18,7 +18,15 @@
#include <linux/compiler.h>
#include <asm/types.h>

-static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)
+#ifdef __ARMEB__
+# define __BIG_ENDIAN
+#else
+# define __LITTLE_ENDIAN
+#endif
+
+#define __SWAB_64_THRU_32__
+
+static inline __attribute_const__ __u32 __arch_swab32(__u32 x)
{
__u32 t;

@@ -40,19 +48,8 @@ static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)

return x;
}
+#define __arch_swab32 __arch_swab32

-#define __arch__swab32(x) ___arch__swab32(x)
-
-#if !defined(__STRICT_ANSI__) || defined(__KERNEL__)
-# define __BYTEORDER_HAS_U64__
-# define __SWAB_64_THRU_32__
-#endif
-
-#ifdef __ARMEB__
-#include <linux/byteorder/big_endian.h>
-#else
-#include <linux/byteorder/little_endian.h>
-#endif
+#include <linux/byteorder.h>

#endif
-
--
1.6.0.274.g8aacc

2008-08-19 07:27:43

by Russell King

Subject: Re: [PATCH 02/23] arm: use the new byteorder headers

On Mon, Aug 18, 2008 at 05:47:55PM -0700, Harvey Harrison wrote:
> Signed-off-by: Harvey Harrison <[email protected]>
> ---
> arch/arm/include/asm/byteorder.h | 25 +++++++++++--------------
> 1 files changed, 11 insertions(+), 14 deletions(-)

You keep posting this, and it's the only bit I see, but... what about
the other bits that it depends on, which without them, it's impossible
to test this patch with?

--
Russell King
Linux kernel 2.6 ARM Linux - http://www.arm.linux.org.uk/
maintainer of:

2008-08-19 19:03:24

by Harvey Harrison

Subject: Re: [PATCH 02/23] arm: use the new byteorder headers

On Tue, 2008-08-19 at 08:27 +0100, Russell King wrote:
> On Mon, Aug 18, 2008 at 05:47:55PM -0700, Harvey Harrison wrote:
> > Signed-off-by: Harvey Harrison <[email protected]>
> > ---
> > arch/arm/include/asm/byteorder.h | 25 +++++++++++--------------
> > 1 files changed, 11 insertions(+), 14 deletions(-)
>
> You keep posting this, and it's the only bit I see, but... what about
> the other bits that it depends on, which without them, it's impossible
> to test this patch with?
>

include/linux/swab.h, include/linux/byteorder.h are in current mainline
which is all that these patches depend on.

Harvey