avr32: introduce asm/swab.h
PATCH 2/23 avr32: introduce asm/swab.h
Signed-off-by Harvey Harrison <[email protected]>
--- arch/avr32/include/asm/Kbuild | 1 + arch/avr32/include/asm/byteorder.h | 31 ++----------------------------- arch/avr32/include/asm/swab.h | 35 +++++++++++++++++++++++++++++++++++ 3 files changed, 38 insertions(+), 29 deletions(-)
arch/avr32/include/asm/Kbuild +1 -0
@@ -1,3 +1,4 @@ include include/asm-generic/Kbuild.asm +header-y += swab.h header-y += cachectl.h
arch/avr32/include/asm/byteorder.h +2 -29
@@ -4,34 +4,7 @@#ifndef __ASM_AVR32_BYTEORDER_H#define __ASM_AVR32_BYTEORDER_H -#include <asm/types.h> -#include <linux/compiler.h> +#include <asm/swab.h> +#include <linux/byteorder/big_endian.h> -#define __BIG_ENDIAN -#define __SWAB_64_THRU_32__ - -#ifdef __CHECKER__ -extern unsigned long __builtin_bswap_32 (unsigned long x); -extern unsigned short __builtin_bswap_16 (unsigned short x); -#endif - -/* -* avr32-linux-gcc versions earlier than 4.2 improperly sign-extends -* the result. -*/ -#if !(__GNUC__ ==4 && __GNUC_MINOR__ <2 ) -static inline __attribute_const__ __u16 __arch_swab16(__u16 val) -{ -return __builtin_bswap_16 (val); -} -#define __arch_swab16 __arch_swab16 - -static inline __attribute_const__ __u32 __arch_swab32(__u32 val) -{ -return __builtin_bswap_32 (val); -} -#define __arch_swab32 __arch_swab32 -#endif - -#include <linux/byteorder.h> #endif /* __ASM_AVR32_BYTEORDER_H */
arch/avr32/include/asm/swab.h new file +35 -0
@@ -0,0 +1,35 @@ +/* +* AVR32 byteswapping functions. +*/ +#ifndef __ASM_AVR32_SWAB_H +#define __ASM_AVR32_SWAB_H + +#include <asm/types.h> +#include <linux/compiler.h> + +#define __SWAB_64_THRU_32__ + +#ifdef __CHECKER__ +extern unsigned long __builtin_bswap_32 (unsigned long x); +extern unsigned short __builtin_bswap_16 (unsigned short x); +#endif + +/* +* avr32-linux-gcc versions earlier than 4.2 improperly sign-extends +* the result. +*/ +#if !(__GNUC__ ==4 && __GNUC_MINOR__ <2 ) +static inline __attribute_const__ __u16 __arch_swab16(__u16 val) +{ +return __builtin_bswap_16 (val); +} +#define __arch_swab16 __arch_swab16 + +static inline __attribute_const__ __u32 __arch_swab32(__u32 val) +{ +return __builtin_bswap_32 (val); +} +#define __arch_swab32 __arch_swab32 +#endif + +#endif /* __ASM_AVR32_SWAB_H */
Signature · 1 line
1.6.1.94.g9388
Quoted 1 line · Harvey Harrison
Signed-off-by Harvey Harrison <[email protected]>
Looks good to me. This fixes the recent userspace breakage, right?