diff options
author | Russell King <rmk+kernel@armlinux.org.uk> | 2016-10-18 16:46:18 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@armlinux.org.uk> | 2016-10-19 05:18:47 -0400 |
commit | 6127d124ee4eb9c39983813cc9803f3654ab7e16 (patch) | |
tree | 6b9862f261b8555f94cdf5d583b77e428b6eeeca | |
parent | 04946fb60fb157faafa01658dff3131d49f49ccb (diff) |
ARM: wire up new pkey syscalls
Wire up the new pkey syscalls for ARM.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
-rw-r--r-- | arch/arm/include/asm/unistd.h | 2 | ||||
-rw-r--r-- | arch/arm/include/uapi/asm/unistd.h | 3 | ||||
-rw-r--r-- | arch/arm/kernel/calls.S | 3 |
3 files changed, 7 insertions, 1 deletions
diff --git a/arch/arm/include/asm/unistd.h b/arch/arm/include/asm/unistd.h index 194b69923389..ada0d29a660f 100644 --- a/arch/arm/include/asm/unistd.h +++ b/arch/arm/include/asm/unistd.h | |||
@@ -19,7 +19,7 @@ | |||
19 | * This may need to be greater than __NR_last_syscall+1 in order to | 19 | * This may need to be greater than __NR_last_syscall+1 in order to |
20 | * account for the padding in the syscall table | 20 | * account for the padding in the syscall table |
21 | */ | 21 | */ |
22 | #define __NR_syscalls (396) | 22 | #define __NR_syscalls (400) |
23 | 23 | ||
24 | #define __ARCH_WANT_STAT64 | 24 | #define __ARCH_WANT_STAT64 |
25 | #define __ARCH_WANT_SYS_GETHOSTNAME | 25 | #define __ARCH_WANT_SYS_GETHOSTNAME |
diff --git a/arch/arm/include/uapi/asm/unistd.h b/arch/arm/include/uapi/asm/unistd.h index 2cb9dc770e1d..314100a06ccb 100644 --- a/arch/arm/include/uapi/asm/unistd.h +++ b/arch/arm/include/uapi/asm/unistd.h | |||
@@ -420,6 +420,9 @@ | |||
420 | #define __NR_copy_file_range (__NR_SYSCALL_BASE+391) | 420 | #define __NR_copy_file_range (__NR_SYSCALL_BASE+391) |
421 | #define __NR_preadv2 (__NR_SYSCALL_BASE+392) | 421 | #define __NR_preadv2 (__NR_SYSCALL_BASE+392) |
422 | #define __NR_pwritev2 (__NR_SYSCALL_BASE+393) | 422 | #define __NR_pwritev2 (__NR_SYSCALL_BASE+393) |
423 | #define __NR_pkey_mprotect (__NR_SYSCALL_BASE+394) | ||
424 | #define __NR_pkey_alloc (__NR_SYSCALL_BASE+395) | ||
425 | #define __NR_pkey_free (__NR_SYSCALL_BASE+396) | ||
423 | 426 | ||
424 | /* | 427 | /* |
425 | * The following SWIs are ARM private. | 428 | * The following SWIs are ARM private. |
diff --git a/arch/arm/kernel/calls.S b/arch/arm/kernel/calls.S index 703fa0f3cd8f..08030b18f10a 100644 --- a/arch/arm/kernel/calls.S +++ b/arch/arm/kernel/calls.S | |||
@@ -403,6 +403,9 @@ | |||
403 | CALL(sys_copy_file_range) | 403 | CALL(sys_copy_file_range) |
404 | CALL(sys_preadv2) | 404 | CALL(sys_preadv2) |
405 | CALL(sys_pwritev2) | 405 | CALL(sys_pwritev2) |
406 | CALL(sys_pkey_mprotect) | ||
407 | /* 395 */ CALL(sys_pkey_alloc) | ||
408 | CALL(sys_pkey_free) | ||
406 | #ifndef syscalls_counted | 409 | #ifndef syscalls_counted |
407 | .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls | 410 | .equ syscalls_padding, ((NR_syscalls + 3) & ~3) - NR_syscalls |
408 | #define syscalls_counted | 411 | #define syscalls_counted |