Commit ad38dab0 authored by Harvey Harrison's avatar Harvey Harrison Committed by Ingo Molnar
Browse files

x86: use the new byteorder headers 



Impact: cleanup, no functionality changed

Signed-off-by: default avatarHarvey Harrison <harvey.harrison@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c63dfefd

arch/x86/include/asm/byteorder.h

+29 −45
Original line number Diff line number Diff line
@@ -4,26 +4,33 @@ 
#include <asm/types.h>

#include <linux/compiler.h>



#ifdef __GNUC__

#define __LITTLE_ENDIAN



#ifdef __i386__



static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)

static inline __attribute_const__ __u32 __arch_swab32(__u32 val)

{

#ifdef __i386__

# ifdef CONFIG_X86_BSWAP

	asm("bswap %0" : "=r" (x) : "0" (x));

	asm("bswap %0" : "=r" (val) : "0" (val));

# else

	asm("xchgb %b0,%h0\n\t"	/* swap lower bytes	*/

	    "rorl $16,%0\n\t"	/* swap words		*/

	    "xchgb %b0,%h0"	/* swap higher bytes	*/

	    : "=q" (x)

	    : "0" (x));

	    : "=q" (val)

	    : "0" (val));

# endif



#else /* __i386__ */

	asm("bswapl %0"

	    : "=r" (val)

	    : "0" (val));

#endif

	return x;

	return val;

}

#define __arch_swab32 __arch_swab32



static inline __attribute_const__ __u64 ___arch__swab64(__u64 val)

static inline __attribute_const__ __u64 __arch_swab64(__u64 val)

{

#ifdef __i386__

	union {

		struct {

			__u32 a;
@@ -37,45 +44,22 @@ static inline __attribute_const__ __u64 ___arch__swab64(__u64 val) 
	    : "=r" (v.s.a), "=r" (v.s.b)

	    : "0" (v.s.a), "1" (v.s.b));

# else

	v.s.a = ___arch__swab32(v.s.a);

	v.s.b = ___arch__swab32(v.s.b);

	v.s.a = __arch_swab32(v.s.a);

	v.s.b = __arch_swab32(v.s.b);

	asm("xchgl %0,%1"

	    : "=r" (v.s.a), "=r" (v.s.b)

	    : "0" (v.s.a), "1" (v.s.b));

# endif

	return v.u;

}



#else /* __i386__ */



static inline __attribute_const__ __u64 ___arch__swab64(__u64 x)

{

	asm("bswapq %0"

	    : "=r" (x)

	    : "0" (x));

	return x;

}



static inline __attribute_const__ __u32 ___arch__swab32(__u32 x)

{

	asm("bswapl %0"

	    : "=r" (x)

	    : "0" (x));

	return x;

}



	    : "=r" (val)

	    : "0" (val));

	return val;

#endif

}

#define __arch_swab64 __arch_swab64



/* Do not define swab16.  Gcc is smart enough to recognize "C" version and

   convert it into rotation or exhange.  */



#define __arch__swab64(x) ___arch__swab64(x)

#define __arch__swab32(x) ___arch__swab32(x)



#define __BYTEORDER_HAS_U64__



#endif /* __GNUC__ */



#include <linux/byteorder/little_endian.h>

#include <linux/byteorder.h>



#endif /* _ASM_X86_BYTEORDER_H */