The following commit has been merged into the x86/entry branch of tip:
Commit-ID: 15f720aabe71a5662c4198b22532d95bbeec80ef
Gitweb:
https://git.kernel.org/tip/15f720aabe71a5662c4198b22532d95bbeec80ef
Author: Thomas Gleixner <t...@linutronix.de>
AuthorDate: Wed, 10 Feb 2021 00:40:42 +01:00
Committer: Thomas Gleixner <t...@linutronix.de>
CommitterDate: Wed, 10 Feb 2021 23:34:13 +01:00
x86/entry: Fix instrumentation annotation
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
---
arch/x86/entry/common.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
index 18d8f17..c4efffb 100644
--- a/arch/x86/entry/common.c
+++ b/arch/x86/entry/common.c
@@ -266,7 +266,7 @@ __visible noinstr void xen_pv_evtchn_do_upcall(struct
pt_regs *regs)
instrumentation_begin();
run_on_irqstack_cond(__xen_pv_evtchn_do_upcall, regs);
- instrumentation_begin();
+ instrumentation_end();
set_irq_regs(old_regs);
