The following commit has been merged into the x86/cleanups branch of tip: Commit-ID: 99ce3255fddf08fca9249488793c9b5c909ff0ab Gitweb: https://git.kernel.org/tip/99ce3255fddf08fca9249488793c9b5c909ff0ab Author: Benjamin Thiel <b.thiel@xxxxxxxxx> AuthorDate: Thu, 23 Jan 2020 16:27:54 +01:00 Committer: Borislav Petkov <bp@xxxxxxx> CommitterDate: Mon, 17 Feb 2020 18:22:25 +01:00 x86/syscalls: Add prototypes for C syscall callbacks .. in order to fix a couple of -Wmissing-prototypes warnings. No functional change. [ bp: Massage commit message and drop newlines. ] Signed-off-by: Benjamin Thiel <b.thiel@xxxxxxxxx> Signed-off-by: Borislav Petkov <bp@xxxxxxx> Link: https://lkml.kernel.org/r/20200123152754.20149-1-b.thiel@xxxxxxxxx --- arch/x86/entry/common.c | 1 + arch/x86/include/asm/syscall.h | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c index 9747876..ec167d8 100644 --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -34,6 +34,7 @@ #include <asm/fpu/api.h> #include <asm/nospec-branch.h> #include <asm/io_bitmap.h> +#include <asm/syscall.h> #define CREATE_TRACE_POINTS #include <trace/events/syscalls.h> diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h index 8db3fdb..d20ffc5 100644 --- a/arch/x86/include/asm/syscall.h +++ b/arch/x86/include/asm/syscall.h @@ -168,6 +168,11 @@ static inline int syscall_get_arch(struct task_struct *task) task->thread_info.status & TS_COMPAT) ? AUDIT_ARCH_I386 : AUDIT_ARCH_X86_64; } + +void do_syscall_64(unsigned long nr, struct pt_regs *regs); +void do_int80_syscall_32(struct pt_regs *regs); +long do_fast_syscall_32(struct pt_regs *regs); + #endif /* CONFIG_X86_32 */ #endif /* _ASM_X86_SYSCALL_H */
|