OSDN Git Service
(root)
/
tomoyo
/
tomoyo-test1.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
77ca93a
)
x86/mce: Remove explicit/superfluous tracing
author
Peter Zijlstra
<peterz@infradead.org>
Wed, 6 Jan 2021 14:36:24 +0000
(15:36 +0100)
committer
Thomas Gleixner
<tglx@linutronix.de>
Tue, 12 Jan 2021 20:10:59 +0000
(21:10 +0100)
There's some explicit tracing left in exc_machine_check_kernel(),
remove it, as it's already implied by irqentry_nmi_enter().
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Link:
https://lore.kernel.org/r/20210106144017.719310466@infradead.org
arch/x86/kernel/cpu/mce/core.c
patch
|
blob
|
history
diff --git
a/arch/x86/kernel/cpu/mce/core.c
b/arch/x86/kernel/cpu/mce/core.c
index
13d3f1c
..
e133ce1
100644
(file)
--- a/
arch/x86/kernel/cpu/mce/core.c
+++ b/
arch/x86/kernel/cpu/mce/core.c
@@
-1992,10
+1992,9
@@
static __always_inline void exc_machine_check_kernel(struct pt_regs *regs)
* that out because it's an indirect call. Annotate it.
*/
instrumentation_begin();
- trace_hardirqs_off_finish();
+
machine_check_vector(regs);
- if (regs->flags & X86_EFLAGS_IF)
- trace_hardirqs_on_prepare();
+
instrumentation_end();
irqentry_nmi_exit(regs, irq_state);
}
@@
-2004,7
+2003,9
@@
static __always_inline void exc_machine_check_user(struct pt_regs *regs)
{
irqentry_enter_from_user_mode(regs);
instrumentation_begin();
+
machine_check_vector(regs);
+
instrumentation_end();
irqentry_exit_to_user_mode(regs);
}