Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 398cf93a authored by Harvey Harrison's avatar Harvey Harrison Committed by David S. Miller
Browse files

sparc: use the new byteorder headers

parent 12a9ee3c
Loading
Loading
Loading
Loading
+8 −14
Original line number Original line Diff line number Diff line
@@ -4,15 +4,14 @@
#include <asm/types.h>
#include <asm/types.h>
#include <asm/asi.h>
#include <asm/asi.h>


#ifdef __GNUC__
#define __BIG_ENDIAN


#ifdef CONFIG_SPARC32
#ifdef CONFIG_SPARC32
#define __SWAB_64_THRU_32__
#define __SWAB_64_THRU_32__
#endif
#endif


#ifdef CONFIG_SPARC64
#ifdef CONFIG_SPARC64

static inline __u16 __arch_swab16p(const __u16 *addr)
static inline __u16 ___arch__swab16p(const __u16 *addr)
{
{
	__u16 ret;
	__u16 ret;


@@ -21,8 +20,9 @@ static inline __u16 ___arch__swab16p(const __u16 *addr)
			      : "r" (addr), "i" (ASI_PL));
			      : "r" (addr), "i" (ASI_PL));
	return ret;
	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;
	__u32 ret;


@@ -31,8 +31,9 @@ static inline __u32 ___arch__swab32p(const __u32 *addr)
			      : "r" (addr), "i" (ASI_PL));
			      : "r" (addr), "i" (ASI_PL));
	return ret;
	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;
	__u64 ret;


@@ -41,17 +42,10 @@ static inline __u64 ___arch__swab64p(const __u64 *addr)
			      : "r" (addr), "i" (ASI_PL));
			      : "r" (addr), "i" (ASI_PL));
	return ret;
	return ret;
}
}

#define __arch_swab64p __arch_swab64p
#define __arch__swab16p(x) ___arch__swab16p(x)
#define __arch__swab32p(x) ___arch__swab32p(x)
#define __arch__swab64p(x) ___arch__swab64p(x)


#endif /* CONFIG_SPARC64 */
#endif /* CONFIG_SPARC64 */


#define __BYTEORDER_HAS_U64__
#include <linux/byteorder.h>

#endif

#include <linux/byteorder/big_endian.h>


#endif /* _SPARC_BYTEORDER_H */
#endif /* _SPARC_BYTEORDER_H */