Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1c1e4362 authored by David Howells's avatar David Howells
Browse files

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: default avatarDavid Howells <dhowells@redhat.com>
Acked-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 89013952

arch/arm64/include/asm/hwcap.h

+3 −1
Original line number Diff line number Diff line
@@ -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

arch/arm64/include/asm/stat.h

+3 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 


#include <asm-generic/stat.h>



#if defined(__KERNEL__) && defined(CONFIG_COMPAT)

#ifdef __KERNEL__

#ifdef CONFIG_COMPAT



#include <asm/compat.h>
@@ -57,6 +58,7 @@ struct stat64 { 
	compat_u64	st_ino;

};



#endif

#endif



#endif

arch/arm64/include/asm/unistd.h

+3 −1
Original line number Diff line number Diff line
@@ -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