projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9488984
)
x86/entry: Fix instrumentation annotation
author
Thomas Gleixner
<tglx@linutronix.de>
Tue, 9 Feb 2021 23:40:42 +0000
(
00:40
+0100)
committer
Greg Kroah-Hartman
<gregkh@linuxfoundation.org>
Thu, 4 Mar 2021 10:38:35 +0000
(11:38 +0100)
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>
arch/x86/entry/common.c
patch
|
blob
|
history
diff --git
a/arch/x86/entry/common.c
b/arch/x86/entry/common.c
index
94c6e63
..
de53586
100644
(file)
--- 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);