5.10-stable patches

added patches:
	x86-ftrace-add-unwind_hint_func-annotation-for-ftrace_stub.patch

diff --git a/queue-5.10/series b/queue-5.10/series
index 73f7aae844a0a34105a005082f15ff410866837a..74fc20bc2a73bc62a956f63c12e149a2b32ed36b 100644 (file)
--- a/queue-5.10/series
+++ b/queue-5.10/series
@@ -131,3 +131,4 @@ x86-static_call-serialize-__static_call_fixup-properly.patch
 tools-insn-restore-the-relative-include-paths-for-cross-building.patch
 x86-kvm-use-proper-asm-macros-for-kvm_vcpu_is_preempted.patch
 x86-xen-fix-initialisation-in-hypercall_page-after-rethunk.patch
+x86-ftrace-add-unwind_hint_func-annotation-for-ftrace_stub.patch

diff --git a/queue-5.10/x86-ftrace-add-unwind_hint_func-annotation-for-ftrace_stub.patch b/queue-5.10/x86-ftrace-add-unwind_hint_func-annotation-for-ftrace_stub.patch
new file mode 100644 (file)
index 0000000..0ab8874
--- /dev/null
+++ b/queue-5.10/x86-ftrace-add-unwind_hint_func-annotation-for-ftrace_stub.patch
@@ -0,0 +1,31 @@
+From 18660698a3d30868524cefb60dcd4e0e297f71bb Mon Sep 17 00:00:00 2001
+From: Josh Poimboeuf <jpoimboe@redhat.com>
+Date: Thu, 21 Jan 2021 15:29:21 -0600
+Subject: x86/ftrace: Add UNWIND_HINT_FUNC annotation for ftrace_stub
+
+From: Josh Poimboeuf <jpoimboe@redhat.com>
+
+commit 18660698a3d30868524cefb60dcd4e0e297f71bb upstream.
+
+Prevent an unreachable objtool warning after the sibling call detection
+gets improved.  ftrace_stub() is basically a function, annotate it as
+such.
+
+Acked-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
+Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
+Link: https://lore.kernel.org/r/6845e1b2fb0723a95740c6674e548ba38c5ea489.1611263461.git.jpoimboe@redhat.com
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/x86/kernel/ftrace_64.S |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/arch/x86/kernel/ftrace_64.S
++++ b/arch/x86/kernel/ftrace_64.S
+@@ -173,6 +173,7 @@ SYM_INNER_LABEL(ftrace_graph_call, SYM_L
+  * It is also used to copy the RET for trampolines.
+  */
+ SYM_INNER_LABEL_ALIGN(ftrace_stub, SYM_L_WEAK)
++      UNWIND_HINT_FUNC
+       RET
+ SYM_FUNC_END(ftrace_epilogue)
+