mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 21:57:43 +00:00
x86/traps: Mark sync_regs() noinstr
Replace the notrace and NOKPROBE annotations with noinstr. Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Reviewed-by: Alexandre Chartre <alexandre.chartre@oracle.com> Reviewed-by: Masami Hiramatsu <mhiramat@kernel.org> Acked-by: Peter Zijlstra <peterz@infradead.org> Acked-by: Andy Lutomirski <luto@kernel.org> Link: https://lkml.kernel.org/r/20200505134903.439765290@linutronix.de
This commit is contained in:
parent
d73a332936
commit
daf7a69787
1 changed files with 1 additions and 2 deletions
|
@ -564,14 +564,13 @@ NOKPROBE_SYMBOL(do_int3);
|
||||||
* to switch to the normal thread stack if the interrupted code was in
|
* 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
|
* 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;
|
struct pt_regs *regs = (struct pt_regs *)this_cpu_read(cpu_current_top_of_stack) - 1;
|
||||||
if (regs != eregs)
|
if (regs != eregs)
|
||||||
*regs = *eregs;
|
*regs = *eregs;
|
||||||
return regs;
|
return regs;
|
||||||
}
|
}
|
||||||
NOKPROBE_SYMBOL(sync_regs);
|
|
||||||
|
|
||||||
struct bad_iret_stack {
|
struct bad_iret_stack {
|
||||||
void *error_entry_ret;
|
void *error_entry_ret;
|
||||||
|
|
Loading…
Reference in a new issue