]> git.baikalelectronics.ru Git - kernel.git/commit
ftrace/x86: Add back ftrace_expected assignment
authorSteven Rostedt (Google) <rostedt@goodmis.org>
Tue, 26 Jul 2022 14:18:51 +0000 (10:18 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Aug 2022 12:24:18 +0000 (14:24 +0200)
commit04955c3581a3a471422ae239933d51bd6e58a8ea
tree60dfc9494637ce94f4f927774e046903e54dd881
parent04442ab8058e375077ce6cb95415fad1848815f7
ftrace/x86: Add back ftrace_expected assignment

commit bbadcedb9e5c2d62aa5f35202d03810a1dba6a99 upstream.

When a ftrace_bug happens (where ftrace fails to modify a location) it is
helpful to have what was at that location as well as what was expected to
be there.

But with the conversion to text_poke() the variable that assigns the
expected for debugging was dropped. Unfortunately, I noticed this when I
needed it. Add it back.

Link: https://lkml.kernel.org/r/20220726101851.069d2e70@gandalf.local.home
Cc: "x86@kernel.org" <x86@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Andrew Morton <akpm@linux-foundation.org>
Cc: stable@vger.kernel.org
Fixes: cdfebad7bc9b ("x86/ftrace: Use text_poke()")
Signed-off-by: Steven Rostedt (Google) <rostedt@goodmis.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
arch/x86/kernel/ftrace.c