diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-05 14:31:54 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-09-05 14:31:54 -0700 |
| commit | 6f74b1849bf04432c4a2fe21f594136e5b9d1fad (patch) | |
| tree | 5aa44568b43b931ba4510d68cf040da285b2fc04 /arch | |
| parent | b693ffe67363119199ffe9f2fac9119475968e8a (diff) | |
| parent | b35de672e74ceea6482b4f690ad053aec8465c5d (diff) | |
| download | kernel_samsung_aries-6f74b1849bf04432c4a2fe21f594136e5b9d1fad.zip kernel_samsung_aries-6f74b1849bf04432c4a2fe21f594136e5b9d1fad.tar.gz kernel_samsung_aries-6f74b1849bf04432c4a2fe21f594136e5b9d1fad.tar.bz2 | |
Merge git://git.infradead.org/~dwmw2/dwmw2-2.6.27
* git://git.infradead.org/~dwmw2/dwmw2-2.6.27:
Revert "[ARM] use the new byteorder headers"
Fix conditional export of kvh.h and a.out.h to userspace.
[MTD] [NAND] tmio_nand: fix base address programming
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/include/asm/byteorder.h | 25 |
1 files changed, 14 insertions, 11 deletions
diff --git a/arch/arm/include/asm/byteorder.h b/arch/arm/include/asm/byteorder.h index d04a7a2..4fbfb22 100644 --- a/arch/arm/include/asm/byteorder.h +++ b/arch/arm/include/asm/byteorder.h @@ -18,15 +18,7 @@ #include <linux/compiler.h> #include <asm/types.h> -#ifdef __ARMEB__ -# define __BIG_ENDIAN -#else -# define __LITTLE_ENDIAN -#endif - -#define __SWAB_64_THRU_32__ - -static inline __attribute_const__ __u32 __arch_swab32(__u32 x) +static inline __attribute_const__ __u32 ___arch__swab32(__u32 x) { __u32 t; @@ -48,8 +40,19 @@ static inline __attribute_const__ __u32 __arch_swab32(__u32 x) return x; } -#define __arch_swab32 __arch_swab32 -#include <linux/byteorder.h> +#define __arch__swab32(x) ___arch__swab32(x) + +#if !defined(__STRICT_ANSI__) || defined(__KERNEL__) +# define __BYTEORDER_HAS_U64__ +# define __SWAB_64_THRU_32__ +#endif + +#ifdef __ARMEB__ +#include <linux/byteorder/big_endian.h> +#else +#include <linux/byteorder/little_endian.h> +#endif #endif + |