2008-08-13 00:32:31

by Harvey Harrison

Subject: [PATCH 18/22] sparc: use the new byteorder headers

Signed-off-by: Harvey Harrison <[email protected]>
---
The prerequisite patches have landed in Linus' tree now.

arch/sparc/include/asm/byteorder.h | 22 ++++++++--------------
1 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/arch/sparc/include/asm/byteorder.h b/arch/sparc/include/asm/byteorder.h
index bcd83aa..5a70f13 100644
--- a/arch/sparc/include/asm/byteorder.h
+++ b/arch/sparc/include/asm/byteorder.h
@@ -4,15 +4,14 @@
#include <asm/types.h>
#include <asm/asi.h>

-#ifdef __GNUC__
+#define __BIG_ENDIAN

#ifdef CONFIG_SPARC32
#define __SWAB_64_THRU_32__
#endif

#ifdef CONFIG_SPARC64
-
-static inline __u16 ___arch__swab16p(const __u16 *addr)
+static inline __u16 __arch_swab16p(const __u16 *addr)
{
__u16 ret;

@@ -21,8 +20,9 @@ static inline __u16 ___arch__swab16p(const __u16 *addr)
: "r" (addr), "i" (ASI_PL));
return ret;
}
+#define __arch_swab16p __arch_swab16p

-static inline __u32 ___arch__swab32p(const __u32 *addr)
+static inline __u32 __arch_swab32p(const __u32 *addr)
{
__u32 ret;

@@ -31,8 +31,9 @@ static inline __u32 ___arch__swab32p(const __u32 *addr)
: "r" (addr), "i" (ASI_PL));
return ret;
}
+#define __arch_swab32p __arch_swab32p

-static inline __u64 ___arch__swab64p(const __u64 *addr)
+static inline __u64 __arch_swab64p(const __u64 *addr)
{
__u64 ret;

@@ -41,17 +42,10 @@ static inline __u64 ___arch__swab64p(const __u64 *addr)
: "r" (addr), "i" (ASI_PL));
return ret;
}
-
-#define __arch__swab16p(x) ___arch__swab16p(x)
-#define __arch__swab32p(x) ___arch__swab32p(x)
-#define __arch__swab64p(x) ___arch__swab64p(x)
+#define __arch_swab64p __arch_swab64p

#endif /* CONFIG_SPARC64 */

-#define __BYTEORDER_HAS_U64__
-
-#endif
-
-#include <linux/byteorder/big_endian.h>
+#include <linux/byteorder.h>

#endif /* _SPARC_BYTEORDER_H */
--
1.6.0.rc2.233.g3cb9d

2008-08-13 00:46:24

by David Miller

Subject: Re: [PATCH 18/22] sparc: use the new byteorder headers

From: Harvey Harrison <[email protected]>
Date: Tue, 12 Aug 2008 17:27:14 -0700

> Signed-off-by: Harvey Harrison <[email protected]>

Acked-by: David S. Miller <[email protected]>

2008-08-13 01:01:08

by Andrew Morton

Subject: Re: [PATCH 18/22] sparc: use the new byteorder headers

On Tue, 12 Aug 2008 17:46:17 -0700 (PDT)
David Miller <[email protected]> wrote:

> From: Harvey Harrison <[email protected]>
> Date: Tue, 12 Aug 2008 17:27:14 -0700
>
> > Signed-off-by: Harvey Harrison <[email protected]>
>
> Acked-by: David S. Miller <[email protected]>

You should be able to apply this now, if desired.

2008-08-13 01:02:17

by David Miller

Subject: Re: [PATCH 18/22] sparc: use the new byteorder headers

From: Andrew Morton <[email protected]>
Date: Tue, 12 Aug 2008 18:00:52 -0700

> On Tue, 12 Aug 2008 17:46:17 -0700 (PDT)
> David Miller <[email protected]> wrote:
>
> > From: Harvey Harrison <[email protected]>
> > Date: Tue, 12 Aug 2008 17:27:14 -0700
> >
> > > Signed-off-by: Harvey Harrison <[email protected]>
> >
> > Acked-by: David S. Miller <[email protected]>
>
> You should be able to apply this now, if desired.

I would prefer if you merge it as I have a bunch of stuff
already pending in my sparc-2.6 tree and I don't want to
merge in Linus's tree just to apply this one. :-)