mirror of
https://git.proxmox.com/git/mirror_ubuntu-kernels.git
synced 2025-11-23 09:24:08 +00:00
f86128050d
Commit6ac19f9651("arm64: avoid prototype warnings for syscalls") added missing declarations to various syscall wrapper macros. It however proved a little too zealous in __SYSCALL_DEFINEx(), as a declaration for __arm64_sys##name was already present. A declaration is required before the call to ALLOW_ERROR_INJECTION(), so keep the original one and remove the new one. Fixes:6ac19f9651("arm64: avoid prototype warnings for syscalls") Signed-off-by: Kevin Brodsky <kevin.brodsky@arm.com> Acked-by: Arnd Bergmann <arnd@arndb.de> Link: https://lore.kernel.org/r/20231109141153.250046-1-kevin.brodsky@arm.com Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
87 lines
3.3 KiB
C
87 lines
3.3 KiB
C
/* SPDX-License-Identifier: GPL-2.0 */
|
|
/*
|
|
* syscall_wrapper.h - arm64 specific wrappers to syscall definitions
|
|
*
|
|
* Based on arch/x86/include/asm_syscall_wrapper.h
|
|
*/
|
|
|
|
#ifndef __ASM_SYSCALL_WRAPPER_H
|
|
#define __ASM_SYSCALL_WRAPPER_H
|
|
|
|
#include <asm/ptrace.h>
|
|
|
|
#define SC_ARM64_REGS_TO_ARGS(x, ...) \
|
|
__MAP(x,__SC_ARGS \
|
|
,,regs->regs[0],,regs->regs[1],,regs->regs[2] \
|
|
,,regs->regs[3],,regs->regs[4],,regs->regs[5])
|
|
|
|
#ifdef CONFIG_COMPAT
|
|
|
|
#define COMPAT_SYSCALL_DEFINEx(x, name, ...) \
|
|
asmlinkage long __arm64_compat_sys##name(const struct pt_regs *regs); \
|
|
ALLOW_ERROR_INJECTION(__arm64_compat_sys##name, ERRNO); \
|
|
static long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
|
|
static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
|
|
asmlinkage long __arm64_compat_sys##name(const struct pt_regs *regs) \
|
|
{ \
|
|
return __se_compat_sys##name(SC_ARM64_REGS_TO_ARGS(x,__VA_ARGS__)); \
|
|
} \
|
|
static long __se_compat_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \
|
|
{ \
|
|
return __do_compat_sys##name(__MAP(x,__SC_DELOUSE,__VA_ARGS__)); \
|
|
} \
|
|
static inline long __do_compat_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
|
|
|
|
#define COMPAT_SYSCALL_DEFINE0(sname) \
|
|
asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused); \
|
|
ALLOW_ERROR_INJECTION(__arm64_compat_sys_##sname, ERRNO); \
|
|
asmlinkage long __arm64_compat_sys_##sname(const struct pt_regs *__unused)
|
|
|
|
#define COND_SYSCALL_COMPAT(name) \
|
|
asmlinkage long __arm64_compat_sys_##name(const struct pt_regs *regs); \
|
|
asmlinkage long __weak __arm64_compat_sys_##name(const struct pt_regs *regs) \
|
|
{ \
|
|
return sys_ni_syscall(); \
|
|
}
|
|
|
|
#define COMPAT_SYS_NI(name) \
|
|
SYSCALL_ALIAS(__arm64_compat_sys_##name, sys_ni_posix_timers);
|
|
|
|
#endif /* CONFIG_COMPAT */
|
|
|
|
#define __SYSCALL_DEFINEx(x, name, ...) \
|
|
asmlinkage long __arm64_sys##name(const struct pt_regs *regs); \
|
|
ALLOW_ERROR_INJECTION(__arm64_sys##name, ERRNO); \
|
|
static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \
|
|
static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
|
|
asmlinkage long __arm64_sys##name(const struct pt_regs *regs) \
|
|
{ \
|
|
return __se_sys##name(SC_ARM64_REGS_TO_ARGS(x,__VA_ARGS__)); \
|
|
} \
|
|
static long __se_sys##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \
|
|
{ \
|
|
long ret = __do_sys##name(__MAP(x,__SC_CAST,__VA_ARGS__)); \
|
|
__MAP(x,__SC_TEST,__VA_ARGS__); \
|
|
__PROTECT(x, ret,__MAP(x,__SC_ARGS,__VA_ARGS__)); \
|
|
return ret; \
|
|
} \
|
|
static inline long __do_sys##name(__MAP(x,__SC_DECL,__VA_ARGS__))
|
|
|
|
#define SYSCALL_DEFINE0(sname) \
|
|
SYSCALL_METADATA(_##sname, 0); \
|
|
asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused); \
|
|
ALLOW_ERROR_INJECTION(__arm64_sys_##sname, ERRNO); \
|
|
asmlinkage long __arm64_sys_##sname(const struct pt_regs *__unused)
|
|
|
|
#define COND_SYSCALL(name) \
|
|
asmlinkage long __arm64_sys_##name(const struct pt_regs *regs); \
|
|
asmlinkage long __weak __arm64_sys_##name(const struct pt_regs *regs) \
|
|
{ \
|
|
return sys_ni_syscall(); \
|
|
}
|
|
|
|
asmlinkage long __arm64_sys_ni_syscall(const struct pt_regs *__unused);
|
|
#define SYS_NI(name) SYSCALL_ALIAS(__arm64_sys_##name, sys_ni_posix_timers);
|
|
|
|
#endif /* __ASM_SYSCALL_WRAPPER_H */
|