diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2020-03-25 23:47:51 +0100 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2020-05-05 11:27:51 +0200 |
| commit | b2b5e27d92dc0e12834edb9aa51472fd346151d3 (patch) | |
| tree | dba17570ac9b423b903d9091ac78eeaf73418f5b | |
| parent | 42f65055c9dc6bb7a329bebc0e22da67e4c9ef32 (diff) | |
x86/traps: Mark sync_regs() noinstr
Replace the notrace and NOKPROBE annotations with noinstr.
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | arch/x86/kernel/traps.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/x86/kernel/traps.c b/arch/x86/kernel/traps.c index 96b1558fca04..ab36c8ab56bc 100644 --- a/arch/x86/kernel/traps.c +++ b/arch/x86/kernel/traps.c @@ -566,14 +566,13 @@ NOKPROBE_SYMBOL(do_int3); * to switch to the normal thread stack if the interrupted code was in * user mode. The actual stack switch is done in entry_64.S */ -asmlinkage __visible notrace struct pt_regs *sync_regs(struct pt_regs *eregs) +asmlinkage __visible noinstr struct pt_regs *sync_regs(struct pt_regs *eregs) { struct pt_regs *regs = (struct pt_regs *)this_cpu_read(cpu_current_top_of_stack) - 1; if (regs != eregs) *regs = *eregs; return regs; } -NOKPROBE_SYMBOL(sync_regs); struct bad_iret_stack { void *error_entry_ret; |