diff options
Diffstat (limited to 'arch/arm/include/asm/byteorder.h')
-rw-r--r-- | arch/arm/include/asm/byteorder.h | 33 |
1 files changed, 1 insertions, 32 deletions
diff --git a/arch/arm/include/asm/byteorder.h b/arch/arm/include/asm/byteorder.h index 4fbfb22f65a..c02b6fc28e1 100644 --- a/arch/arm/include/asm/byteorder.h +++ b/arch/arm/include/asm/byteorder.h | |||
@@ -15,38 +15,7 @@ | |||
15 | #ifndef __ASM_ARM_BYTEORDER_H | 15 | #ifndef __ASM_ARM_BYTEORDER_H |
16 | #define __ASM_ARM_BYTEORDER_H | 16 | #define __ASM_ARM_BYTEORDER_H |
17 | 17 | ||
18 | #include <linux/compiler.h> | 18 | #include <asm/swab.h> |
19 | #include <asm/types.h> | ||
20 | |||
21 | static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) | ||
22 | { | ||
23 | __u32 t; | ||
24 | |||
25 | #ifndef __thumb__ | ||
26 | if (!__builtin_constant_p(x)) { | ||
27 | /* | ||
28 | * The compiler needs a bit of a hint here to always do the | ||
29 | * right thing and not screw it up to different degrees | ||
30 | * depending on the gcc version. | ||
31 | */ | ||
32 | asm ("eor\t%0, %1, %1, ror #16" : "=r" (t) : "r" (x)); | ||
33 | } else | ||
34 | #endif | ||
35 | t = x ^ ((x << 16) | (x >> 16)); /* eor r1,r0,r0,ror #16 */ | ||
36 | |||
37 | x = (x << 24) | (x >> 8); /* mov r0,r0,ror #8 */ | ||
38 | t &= ~0x00FF0000; /* bic r1,r1,#0x00FF0000 */ | ||
39 | x ^= (t >> 8); /* eor r0,r0,r1,lsr #8 */ | ||
40 | |||
41 | return x; | ||
42 | } | ||
43 | |||
44 | #define __arch__swab32(x) ___arch__swab32(x) | ||
45 | |||
46 | #if !defined(__STRICT_ANSI__) || defined(__KERNEL__) | ||
47 | # define __BYTEORDER_HAS_U64__ | ||
48 | # define __SWAB_64_THRU_32__ | ||
49 | #endif | ||
50 | 19 | ||
51 | #ifdef __ARMEB__ | 20 | #ifdef __ARMEB__ |
52 | #include <linux/byteorder/big_endian.h> | 21 | #include <linux/byteorder/big_endian.h> |