diff options
| author | Harvey Harrison <harvey.harrison@gmail.com> | 2008-08-12 17:26:35 -0700 |
|---|---|---|
| committer | Haavard Skinnemoen <haavard.skinnemoen@atmel.com> | 2008-09-22 09:51:00 +0200 |
| commit | f3c450be7b0defab59e360eca8a7e201d424d526 (patch) | |
| tree | 60e07c57c764376730d002d143ecd2d9999553a5 /arch/avr32/include | |
| parent | 72d31053f62c4bc464c2783974926969614a8649 (diff) | |
| download | linux-3.10-f3c450be7b0defab59e360eca8a7e201d424d526.tar.gz linux-3.10-f3c450be7b0defab59e360eca8a7e201d424d526.tar.bz2 linux-3.10-f3c450be7b0defab59e360eca8a7e201d424d526.zip | |
avr32: use the new byteorder headers
Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
[haavard.skinnemoen@atmel.com: fix <mach/io.h> build breakage]
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Diffstat (limited to 'arch/avr32/include')
| -rw-r--r-- | arch/avr32/include/asm/byteorder.h | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/arch/avr32/include/asm/byteorder.h b/arch/avr32/include/asm/byteorder.h index d77b48ba733..8e3af02076d 100644 --- a/arch/avr32/include/asm/byteorder.h +++ b/arch/avr32/include/asm/byteorder.h @@ -7,6 +7,9 @@ #include <asm/types.h> #include <linux/compiler.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); @@ -17,15 +20,18 @@ extern unsigned short __builtin_bswap_16(unsigned short x); * the result. */ #if !(__GNUC__ == 4 && __GNUC_MINOR__ < 2) -#define __arch__swab32(x) __builtin_bswap_32(x) -#define __arch__swab16(x) __builtin_bswap_16(x) -#endif +static inline __attribute_const__ __u16 __arch_swab16(__u16 val) +{ + return __builtin_bswap_16(val); +} +#define __arch_swab16 __arch_swab16 -#if !defined(__STRICT_ANSI__) || defined(__KERNEL__) -# define __BYTEORDER_HAS_U64__ -# define __SWAB_64_THRU_32__ +static inline __attribute_const__ __u32 __arch_swab32(__u32 val) +{ + return __builtin_bswap_32(val); +} +#define __arch_swab32 __arch_swab32 #endif -#include <linux/byteorder/big_endian.h> - +#include <linux/byteorder.h> #endif /* __ASM_AVR32_BYTEORDER_H */ |