diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-04-10 07:04:04 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-04-10 07:04:04 +0200 |
| commit | a40d2525eaa6ba40ebd39ea2ed9598e13092a7dc (patch) | |
| tree | d5d5515c98d6163e14d56dfe3272cb3b4e9c7d71 /arch/x86/include/asm/syscall.h | |
| parent | 5ce344beaca688f4cdea07045e0b8f03dc537e74 (diff) | |
| parent | 2c71fdf02a95b3dd425b42f28fd47fb2b1d22702 (diff) | |
| download | linux-stable-a40d2525eaa6ba40ebd39ea2ed9598e13092a7dc.tar.gz linux-stable-a40d2525eaa6ba40ebd39ea2ed9598e13092a7dc.tar.bz2 linux-stable-a40d2525eaa6ba40ebd39ea2ed9598e13092a7dc.zip | |
Merge branch 'linus' into x86/urgent, to pick up dependent commits
Prepare to fix aspects of the new BHI code.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/syscall.h')
| -rw-r--r-- | arch/x86/include/asm/syscall.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/arch/x86/include/asm/syscall.h b/arch/x86/include/asm/syscall.h index f44e2f9ab65d..2fc7bc3863ff 100644 --- a/arch/x86/include/asm/syscall.h +++ b/arch/x86/include/asm/syscall.h @@ -16,19 +16,17 @@ #include <asm/thread_info.h> /* for TS_COMPAT */ #include <asm/unistd.h> +/* This is used purely for kernel/trace/trace_syscalls.c */ typedef long (*sys_call_ptr_t)(const struct pt_regs *); extern const sys_call_ptr_t sys_call_table[]; -#if defined(CONFIG_X86_32) -#define ia32_sys_call_table sys_call_table -#else /* * These may not exist, but still put the prototypes in so we * can use IS_ENABLED(). */ -extern const sys_call_ptr_t ia32_sys_call_table[]; -extern const sys_call_ptr_t x32_sys_call_table[]; -#endif +extern long ia32_sys_call(const struct pt_regs *, unsigned int nr); +extern long x32_sys_call(const struct pt_regs *, unsigned int nr); +extern long x64_sys_call(const struct pt_regs *, unsigned int nr); /* * Only the low 32 bits of orig_ax are meaningful, so we return int. @@ -127,6 +125,7 @@ static inline int syscall_get_arch(struct task_struct *task) } bool do_syscall_64(struct pt_regs *regs, int nr); +void do_int80_emulation(struct pt_regs *regs); #endif /* CONFIG_X86_32 */ |