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

Commit 1c1e4362 authored Oct 04, 2012 by David Howells

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>

parent 89013952

arch/arm64/include/asm/hwcap.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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

arch/arm64/include/asm/stat.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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

arch/arm64/include/asm/unistd.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -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