diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2020-04-22 17:16:40 +0200 |
|---|---|---|
| committer | Peter Zijlstra <peterz@infradead.org> | 2020-04-30 20:14:34 +0200 |
| commit | 34fdce6981b96920ced4e0ee56e9db3fb03a33f0 (patch) | |
| tree | a976b04464b5eaad0b574d29e6fa808222dd5e2d /arch/x86/kernel/ftrace_64.S | |
| parent | ca3f0d80dd57c8828bfb5bc0bc79750ea7a1ba26 (diff) | |
| download | linux-34fdce6981b96920ced4e0ee56e9db3fb03a33f0.tar.bz2 | |
x86: Change {JMP,CALL}_NOSPEC argument
In order to change the {JMP,CALL}_NOSPEC macros to call out-of-line
versions of the retpoline magic, we need to remove the '%' from the
argument, such that we can paste it onto symbol names.
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Acked-by: Josh Poimboeuf <jpoimboe@redhat.com>
Link: https://lkml.kernel.org/r/20200428191700.151623523@infradead.org
Diffstat (limited to 'arch/x86/kernel/ftrace_64.S')
| -rw-r--r-- | arch/x86/kernel/ftrace_64.S | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S index 9738ed23964e..aa5d28aeb31e 100644 --- a/arch/x86/kernel/ftrace_64.S +++ b/arch/x86/kernel/ftrace_64.S @@ -301,7 +301,7 @@ trace: * function tracing is enabled. */ movq ftrace_trace_function, %r8 - CALL_NOSPEC %r8 + CALL_NOSPEC r8 restore_mcount_regs jmp fgraph_trace @@ -338,6 +338,6 @@ SYM_CODE_START(return_to_handler) movq 8(%rsp), %rdx movq (%rsp), %rax addq $24, %rsp - JMP_NOSPEC %rdi + JMP_NOSPEC rdi SYM_CODE_END(return_to_handler) #endif |