diff options
| author | David Howells <dhowells@redhat.com> | 2012-10-04 12:10:18 +0100 |
|---|---|---|
| committer | David Howells <dhowells@redhat.com> | 2012-10-04 12:10:18 +0100 |
| commit | 1c1e436269fe840cdbecfaf397b21778dd276f26 (patch) | |
| tree | f3113da17ecff2ca272090c407ca6c7347da8218 /arch | |
| parent | 890139529d45ebd3c60d541f4eddc60e042fdf98 (diff) | |
UAPI: Split compound conditionals containing __KERNEL__ in Arm64
Split compound conditionals containing __KERNEL__ in Arm64 where possible to
make it easier for the UAPI disintegration scripts to handle them.
Signed-off-by: David Howells <dhowells@redhat.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm64/include/asm/hwcap.h | 4 | ||||
| -rw-r--r-- | arch/arm64/include/asm/stat.h | 4 | ||||
| -rw-r--r-- | arch/arm64/include/asm/unistd.h | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/arch/arm64/include/asm/hwcap.h b/arch/arm64/include/asm/hwcap.h index f8190ba45a3e..db05f9766112 100644 --- a/arch/arm64/include/asm/hwcap.h +++ b/arch/arm64/include/asm/hwcap.h @@ -35,7 +35,8 @@ #define COMPAT_HWCAP_IDIVT (1 << 18) #define COMPAT_HWCAP_IDIV (COMPAT_HWCAP_IDIVA|COMPAT_HWCAP_IDIVT) -#if defined(__KERNEL__) && !defined(__ASSEMBLY__) +#ifdef __KERNEL__ +#ifndef __ASSEMBLY__ /* * This yields a mask that user programs can use to figure out what * instruction set this cpu supports. @@ -49,5 +50,6 @@ extern unsigned int elf_hwcap; #endif +#endif #endif diff --git a/arch/arm64/include/asm/stat.h b/arch/arm64/include/asm/stat.h index d87225cbead8..a9f580c28f7b 100644 --- a/arch/arm64/include/asm/stat.h +++ b/arch/arm64/include/asm/stat.h @@ -18,7 +18,8 @@ #include <asm-generic/stat.h> -#if defined(__KERNEL__) && defined(CONFIG_COMPAT) +#ifdef __KERNEL__ +#ifdef CONFIG_COMPAT #include <asm/compat.h> @@ -58,5 +59,6 @@ struct stat64 { }; #endif +#endif #endif diff --git a/arch/arm64/include/asm/unistd.h b/arch/arm64/include/asm/unistd.h index f55ba3e56c32..8f03dee066ed 100644 --- a/arch/arm64/include/asm/unistd.h +++ b/arch/arm64/include/asm/unistd.h @@ -18,6 +18,8 @@ #include <asm-generic/unistd.h> #endif -#if defined(__KERNEL__) && defined(CONFIG_COMPAT) +#ifdef __KERNEL__ +#ifdef CONFIG_COMPAT #include <asm/unistd32.h> #endif +#endif |