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

Commit f3e5c847 authored by Catalin Marinas's avatar Catalin Marinas
Browse files

arm64: Add __NR_* definitions for compat syscalls 



This patch adds __NR_* definitions to asm/unistd32.h, moves the
__NR_compat_* definitions to asm/unistd.h and removes all the explicit
unistd32.h includes apart from the one building the compat syscall
table. The aim is to have the compat __NR_* definitions available but
without colliding with the native syscall definitions (required by
lib/compat_audit.c to avoid duplicating the audit header files between
native and compat).

Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 6c81fe79

arch/arm64/include/asm/unistd.h

+17 −0
Original line number Diff line number Diff line
@@ -26,7 +26,24 @@ 
#define __ARCH_WANT_COMPAT_SYS_SENDFILE

#define __ARCH_WANT_SYS_FORK

#define __ARCH_WANT_SYS_VFORK



/*

 * Compat syscall numbers used by the AArch64 kernel.

 */

#define __NR_compat_restart_syscall	0

#define __NR_compat_sigreturn		119

#define __NR_compat_rt_sigreturn	173



/*

 * The following SVCs are ARM private.

 */

#define __ARM_NR_COMPAT_BASE		0x0f0000

#define __ARM_NR_compat_cacheflush	(__ARM_NR_COMPAT_BASE+2)

#define __ARM_NR_compat_set_tls		(__ARM_NR_COMPAT_BASE+5)



#define __NR_compat_syscalls		383

#endif



#define __ARCH_WANT_SYS_CLONE

#include <uapi/asm/unistd.h>

arch/arm64/include/asm/unistd32.h

+766 −400

File changed.

Preview size limit exceeded, changes collapsed.

arch/arm64/kernel/entry.S

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ 
#include <asm/esr.h>

#include <asm/thread_info.h>

#include <asm/unistd.h>

#include <asm/unistd32.h>



/*

 * Context tracking subsystem.  Used to instrument transitions

arch/arm64/kernel/kuser32.S

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
 * See Documentation/arm/kernel_user_helpers.txt for formal definitions.

 */



#include <asm/unistd32.h>

#include <asm/unistd.h>



	.align	5

	.globl	__kuser_helper_start

arch/arm64/kernel/signal32.c

+1 −1
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ 
#include <asm/fpsimd.h>

#include <asm/signal32.h>

#include <asm/uaccess.h>

#include <asm/unistd32.h>

#include <asm/unistd.h>



struct compat_sigcontext {

	/* We always set these two fields to 0 */