diff options
| author | Ingo Molnar <mingo@kernel.org> | 2024-04-06 13:00:32 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2024-04-06 13:00:32 +0200 |
| commit | 5f2ca44ed235c86a0d6b9bfb599d1664ea94b4b9 (patch) | |
| tree | 0475ba937cecc36b1e38afcd0f3babba23092aba /arch/riscv/include/asm/syscall_wrapper.h | |
| parent | 3ddf944b32f88741c303f0b21459dbb3872b8bc5 (diff) | |
| parent | 6c6e47d69d821047097909288b6d7f1aafb3b9b1 (diff) | |
Merge branch 'linus' into x86/urgent, to pick up dependent commit
We want to fix:
0e110732473e ("x86/retpoline: Do the necessary fixup to the Zen3/4 srso return thunk for !SRSO")
So merge in Linus's latest into x86/urgent to have it available.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/riscv/include/asm/syscall_wrapper.h')
| -rw-r--r-- | arch/riscv/include/asm/syscall_wrapper.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/arch/riscv/include/asm/syscall_wrapper.h b/arch/riscv/include/asm/syscall_wrapper.h index 980094c2e976..ac80216549ff 100644 --- a/arch/riscv/include/asm/syscall_wrapper.h +++ b/arch/riscv/include/asm/syscall_wrapper.h @@ -36,7 +36,8 @@ asmlinkage long __riscv_sys_ni_syscall(const struct pt_regs *); ulong) \ __attribute__((alias(__stringify(___se_##prefix##name)))); \ __diag_pop(); \ - static long noinline ___se_##prefix##name(__MAP(x,__SC_LONG,__VA_ARGS__)); \ + static long noinline ___se_##prefix##name(__MAP(x,__SC_LONG,__VA_ARGS__)) \ + __used; \ static long ___se_##prefix##name(__MAP(x,__SC_LONG,__VA_ARGS__)) #define SC_RISCV_REGS_TO_ARGS(x, ...) \ |