diff options
| author | Linus Torvalds | 2012-01-15 03:03:30 +0100 |
|---|---|---|
| committer | Linus Torvalds | 2012-01-15 03:03:30 +0100 |
| commit | dca88ad6915b65f6e037f8c3e632fcd92a70bd88 (patch) | |
| tree | a3dcbe53310997dcc37c7d49129c48febef53992 /arch/arm/include/asm/swab.h | |
| parent | fsnotify: don't BUG in fsnotify_destroy_mark() (diff) | |
| parent | UAPI: Split trivial #if defined(__KERNEL__) && X conditionals (diff) | |
| download | kernel-qcow2-linux-dca88ad6915b65f6e037f8c3e632fcd92a70bd88.tar.gz kernel-qcow2-linux-dca88ad6915b65f6e037f8c3e632fcd92a70bd88.tar.xz kernel-qcow2-linux-dca88ad6915b65f6e037f8c3e632fcd92a70bd88.zip | |
Merge branch 'for-next' of git://git.infradead.org/users/dhowells/linux-headers
* 'for-next' of git://git.infradead.org/users/dhowells/linux-headers:
UAPI: Split trivial #if defined(__KERNEL__) && X conditionals
UAPI: Don't have a #elif clause in a __KERNEL__ guard in linux/soundcard.h
UAPI: Fix AHZ multiple inclusion when __KERNEL__ is removed
UAPI: Make linux/patchkey.h easier to parse
UAPI: Fix nested __KERNEL__ guards in video/edid.h
UAPI: Alter the S390 asm include guards to be recognisable by the UAPI splitter
UAPI: Guard linux/cuda.h
UAPI: Guard linux/pmu.h
UAPI: Guard linux/isdn_divertif.h
UAPI: Guard linux/sound.h
UAPI: Rearrange definition of HZ in asm-generic/param.h
UAPI: Make FRV use asm-generic/param.h
UAPI: Make M32R use asm-generic/param.h
UAPI: Make MN10300 use asm-generic/param.h
UAPI: elf_read_implies_exec() is a kernel-only feature - so hide from userspace
UAPI: Don't include linux/compat.h in sparc's asm/siginfo.h
UAPI: Fix arch/mips/include/asm/Kbuild to have separate header-y lines
Diffstat (limited to 'arch/arm/include/asm/swab.h')
| -rw-r--r-- | arch/arm/include/asm/swab.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/include/asm/swab.h b/arch/arm/include/asm/swab.h index 32ee164a2f6b..b859d82e30ca 100644 --- a/arch/arm/include/asm/swab.h +++ b/arch/arm/include/asm/swab.h @@ -22,7 +22,8 @@ # 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__ __u32 __arch_swahb32(__u32 x) { @@ -39,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; |