evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

UAPI: Split compound conditionals containing __KERNEL__ in Arm64

Browse source 
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>
This commit is contained in:
David Howells 2012-10-04 12:10:18 +01:00
parent 890139529d
commit 1c1e436269
3 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/arm64/include/asm/hwcap.h
View file

@ -35,7 +35,8 @@
#define COMPAT_HWCAP_IDIVT (1 << 18) #define COMPAT_HWCAP_IDIVT (1 << 18)
#define COMPAT_HWCAP_IDIV (COMPAT_HWCAP_IDIVA|COMPAT_HWCAP_IDIVT) #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 * This yields a mask that user programs can use to figure out what
* instruction set this cpu supports. * instruction set this cpu supports.
@ -49,5 +50,6 @@
extern unsigned int elf_hwcap; extern unsigned int elf_hwcap;
#endif #endif
#endif
#endif #endif

4
arch/arm64/include/asm/stat.h
View file

@ -18,7 +18,8 @@
#include <asm-generic/stat.h> #include <asm-generic/stat.h>
#if defined(__KERNEL__) && defined(CONFIG_COMPAT) #ifdef __KERNEL__
#ifdef CONFIG_COMPAT
#include <asm/compat.h> #include <asm/compat.h>
@ -57,6 +58,7 @@ struct stat64 {
compat_u64 st_ino; compat_u64 st_ino;
}; };
#endif
#endif #endif
#endif #endif

4
arch/arm64/include/asm/unistd.h
View file

@ -18,6 +18,8 @@
#include <asm-generic/unistd.h> #include <asm-generic/unistd.h>
#endif #endif
#if defined(__KERNEL__) && defined(CONFIG_COMPAT) #ifdef __KERNEL__
#ifdef CONFIG_COMPAT
#include <asm/unistd32.h> #include <asm/unistd32.h>
#endif #endif
#endif