diff options
author | Huacai Chen <chenhuacai@loongson.cn> | 2024-07-17 17:07:11 +0800 |
---|---|---|
committer | Huacai Chen <chenhuacai@loongson.cn> | 2024-07-17 17:07:11 +0800 |
commit | 256a6f430562c163f1fa07576c4cd4e996e953dd (patch) | |
tree | 530ce6034bc9c99bb95661b34131db8faf928089 /arch/riscv/kernel/syscall_table.c | |
parent | 0c3836482481200ead7b416ca80c68a29cfdaabd (diff) | |
parent | 1a7b7326d587c9a5e8ff067e70d6aaf0333f4bb3 (diff) |
Merge tag 'asm-generic-6.11' into loongarch-next
LoongArch architecture changes for 6.11 depend on the asm-generic
changes to avoid confliction, so merge them to create a base.
Diffstat (limited to 'arch/riscv/kernel/syscall_table.c')
-rw-r--r-- | arch/riscv/kernel/syscall_table.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/arch/riscv/kernel/syscall_table.c b/arch/riscv/kernel/syscall_table.c index dda913764903..6f1a36cb0f3f 100644 --- a/arch/riscv/kernel/syscall_table.c +++ b/arch/riscv/kernel/syscall_table.c @@ -9,14 +9,16 @@ #include <asm-generic/syscalls.h> #include <asm/syscall.h> +#define __SYSCALL_WITH_COMPAT(nr, native, compat) __SYSCALL(nr, native) + #undef __SYSCALL #define __SYSCALL(nr, call) asmlinkage long __riscv_##call(const struct pt_regs *); -#include <asm/unistd.h> +#include <asm/syscall_table.h> #undef __SYSCALL #define __SYSCALL(nr, call) [nr] = __riscv_##call, void * const sys_call_table[__NR_syscalls] = { [0 ... __NR_syscalls - 1] = __riscv_sys_ni_syscall, -#include <asm/unistd.h> +#include <asm/syscall_table.h> }; |