diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2021-02-10 02:40:42 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-04 13:38:35 +0300 |
| commit | be896eef0e32a11e40d794795b911a87ba566b71 (patch) | |
| tree | 20c497a7f9b5fdd8aa9b2cae0bedb476454dfa3d /arch | |
| parent | 9488984c7d13972385fdf4f23b7e3ad977114d33 (diff) | |
| download | linux-be896eef0e32a11e40d794795b911a87ba566b71.tar.xz | |
x86/entry: Fix instrumentation annotation
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 <tglx@linutronix.de>
Reviewed-by: Kees Cook <keescook@chromium.org>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20210210002512.106502464@linutronix.de
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86/entry/common.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c index 94c6e6330e04..de5358671750 100644 --- a/arch/x86/entry/common.c +++ b/arch/x86/entry/common.c @@ -304,7 +304,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); |