diff options
| author | Tony Lindgren <tony@atomide.com> | 2012-02-17 15:12:36 -0800 |
|---|---|---|
| committer | Tony Lindgren <tony@atomide.com> | 2012-02-17 15:12:36 -0800 |
| commit | 4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4 (patch) | |
| tree | 72e500b97c4bdcb9631209f3121f42b05ae30fea /arch/arm/include/asm/swab.h | |
| parent | 40c0591f0a349ec074357e05c6ab1a3bc951807c (diff) | |
| parent | 19bfb76ca32f8e4fa80746608ff4a77707f40520 (diff) | |
| download | linux-4d68c05ce11f4cdf6a6392f3a18dc6a985b4d0c4.tar.bz2 | |
Merge branch 'for_3.4/dt_base' of git://git.kernel.org/pub/scm/linux/kernel/git/bcousson/linux-omap-dt into dt
Diffstat (limited to 'arch/arm/include/asm/swab.h')
| -rw-r--r-- | arch/arm/include/asm/swab.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/include/asm/swab.h b/arch/arm/include/asm/swab.h index 9997ad20eff1..b859d82e30ca 100644 --- a/arch/arm/include/asm/swab.h +++ b/arch/arm/include/asm/swab.h @@ -22,14 +22,16 @@ # define __SWAB_64_THRU_32__ #endif -#if defined(__KERNEL__) && __LINUX_ARM_ARCH__ >= 6 +#if defined(__KERNEL__) +#if __LINUX_ARM_ARCH__ >= 6 -static inline __attribute_const__ __u16 __arch_swab16(__u16 x) +static inline __attribute_const__ __u32 __arch_swahb32(__u32 x) { __asm__ ("rev16 %0, %1" : "=r" (x) : "r" (x)); return x; } -#define __arch_swab16 __arch_swab16 +#define __arch_swahb32 __arch_swahb32 +#define __arch_swab16(x) ((__u16)__arch_swahb32(x)) static inline __attribute_const__ __u32 __arch_swab32(__u32 x) { @@ -38,8 +40,10 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) } #define __arch_swab32 __arch_swab32 -#else +#endif +#endif +#if !defined(__KERNEL__) || __LINUX_ARM_ARCH__ < 6 static inline __attribute_const__ __u32 __arch_swab32(__u32 x) { __u32 t; |