summaryrefslogtreecommitdiffstats
path: root/arch/arm64/kernel/sys.c
diff options
context:
space:
mode:
authorMark Rutland <mark.rutland@arm.com>2018-07-11 14:56:42 +0100
committerWill Deacon <will.deacon@arm.com>2018-07-12 14:40:39 +0100
commit27d83e68f307ee55b70fdfdc7a9ba3f25f276189 (patch)
tree3e2db6811a0af538dd88b40381e5a63b26f5327c /arch/arm64/kernel/sys.c
parent3085e1645e23888125224f66a710077cdb03106a (diff)
downloadlinux-27d83e68f307ee55b70fdfdc7a9ba3f25f276189.tar.bz2
arm64: introduce syscall_fn_t
In preparation for invoking arbitrary syscalls from C code, let's define a type for an arbitrary syscall, matching the parameter passing rules of the AAPCS. There should be no functional change as a result of this patch. Signed-off-by: Mark Rutland <mark.rutland@arm.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel/sys.c')
-rw-r--r--arch/arm64/kernel/sys.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c
index 31045f3fed92..7f0907261269 100644
--- a/arch/arm64/kernel/sys.c
+++ b/arch/arm64/kernel/sys.c
@@ -25,7 +25,9 @@
#include <linux/sched.h>
#include <linux/slab.h>
#include <linux/syscalls.h>
+
#include <asm/cpufeature.h>
+#include <asm/syscall.h>
asmlinkage long sys_mmap(unsigned long addr, unsigned long len,
unsigned long prot, unsigned long flags,
@@ -52,13 +54,13 @@ asmlinkage long sys_rt_sigreturn(void);
#define sys_personality sys_arm64_personality
#undef __SYSCALL
-#define __SYSCALL(nr, sym) [nr] = sym,
+#define __SYSCALL(nr, sym) [nr] = (syscall_fn_t)sym,
/*
* The sys_call_table array must be 4K aligned to be accessible from
* kernel/entry.S.
*/
-void * const sys_call_table[__NR_syscalls] __aligned(4096) = {
- [0 ... __NR_syscalls - 1] = sys_ni_syscall,
+const syscall_fn_t sys_call_table[__NR_syscalls] __aligned(4096) = {
+ [0 ... __NR_syscalls - 1] = (syscall_fn_t)sys_ni_syscall,
#include <asm/unistd.h>
};