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 <[email protected]> Acked-by: Catalin Marinas <[email protected]> --- arch/arm64/include/asm/hwcap.h | 4 +++- arch/arm64/include/asm/stat.h | 4 +++- 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 f8190ba..db05f97 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 d87225c..a9f580c 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 f55ba3e..8f03dee 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 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
