Commit 15f720aa authored by Thomas Gleixner's avatar Thomas Gleixner

x86/entry: Fix instrumentation annotation

Embracing a callout into instrumentation_begin() / instrumentation_begin()
does not really make sense. Make the latter instrumentation_end().

Fixes: 2f6474e4 ("x86/entry: Switch XEN/PV hypercall entry to IDTENTRY")
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
Reviewed-by: default avatarKees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210210002512.106502464@linutronix.de
parent 4dc1d28c
...@@ -266,7 +266,7 @@ __visible noinstr void xen_pv_evtchn_do_upcall(struct pt_regs *regs) ...@@ -266,7 +266,7 @@ __visible noinstr void xen_pv_evtchn_do_upcall(struct pt_regs *regs)
instrumentation_begin(); instrumentation_begin();
run_on_irqstack_cond(__xen_pv_evtchn_do_upcall, regs); run_on_irqstack_cond(__xen_pv_evtchn_do_upcall, regs);
instrumentation_begin(); instrumentation_end();
set_irq_regs(old_regs); set_irq_regs(old_regs);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment