[PATCH 5.10 570/663] x86/entry: Fix instrumentation annotation

[Greg Kroah-Hartman]

From: Thomas Gleixner <t...@linutronix.de>

commit 15f720aabe71a5662c4198b22532d95bbeec80ef upstream.

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

Fixes: 2f6474e4636b ("x86/entry: Switch XEN/PV hypercall entry to IDTENTRY")
Signed-off-by: Thomas Gleixner <t...@linutronix.de>
Reviewed-by: Kees Cook <keesc...@chromium.org>
Cc: sta...@vger.kernel.org
Link: https://lore.kernel.org/r/20210210002512.106502...@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org>
---
 arch/x86/entry/common.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -304,7 +304,7 @@ __visible noinstr void xen_pv_evtchn_do_
 
        instrumentation_begin();
        run_on_irqstack_cond(__xen_pv_evtchn_do_upcall, regs);
-       instrumentation_begin();
+       instrumentation_end();
 
        set_irq_regs(old_regs);