From: tip-bot for Josh Poimboeuf <tipbot@zytor.com>
To: linux-tip-commits@vger.kernel.org
Cc: tglx@linutronix.de, mingo@kernel.org, rostedt@goodmis.org,
jpoimboe@redhat.com, linux-kernel@vger.kernel.org,
torvalds@linux-foundation.org, bp@alien8.de, hpa@zytor.com
Subject: [tip:x86/urgent] x86/ftrace: Add one more ENDPROC annotation
Date: Sun, 28 Jan 2018 00:22:03 -0800 [thread overview]
Message-ID: <tip-dd085168a74c99c3ebe7f813069e412eb8444243@git.kernel.org> (raw)
In-Reply-To: <20180128022150.dqierscqmt3uwwsr@treble>
Commit-ID: dd085168a74c99c3ebe7f813069e412eb8444243
Gitweb: https://git.kernel.org/tip/dd085168a74c99c3ebe7f813069e412eb8444243
Author: Josh Poimboeuf <jpoimboe@redhat.com>
AuthorDate: Sat, 27 Jan 2018 20:21:50 -0600
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Sun, 28 Jan 2018 09:19:12 +0100
x86/ftrace: Add one more ENDPROC annotation
When ORC support was added for the ftrace_64.S code, an ENDPROC
for function_hook() was missed. This results in the following warning:
arch/x86/kernel/ftrace_64.o: warning: objtool: .entry.text+0x0: unreachable instruction
Fixes: e2ac83d74a4d ("x86/ftrace: Fix ORC unwinding from ftrace handlers")
Reported-by: Steven Rostedt <rostedt@goodmis.org>
Reported-by: Borislav Petkov <bp@alien8.de>
Signed-off-by: Josh Poimboeuf <jpoimboe@redhat.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Ingo Molnar <mingo@kernel.org>
Cc: Linus Torvalds <torvalds@linux-foundation.org>
Link: https://lkml.kernel.org/r/20180128022150.dqierscqmt3uwwsr@treble
---
arch/x86/kernel/ftrace_64.S | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S
index 7cb8ba0..8774fd2 100644
--- a/arch/x86/kernel/ftrace_64.S
+++ b/arch/x86/kernel/ftrace_64.S
@@ -291,7 +291,7 @@ trace:
restore_mcount_regs
jmp fgraph_trace
-END(function_hook)
+ENDPROC(function_hook)
#endif /* CONFIG_DYNAMIC_FTRACE */
#ifdef CONFIG_FUNCTION_GRAPH_TRACER
next prev parent reply other threads:[~2018-01-28 8:25 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-01-27 16:13 arch/x86/kernel/ftrace_64.o: warning: objtool: .entry.text+0x0: unreachable instruction Borislav Petkov
2018-01-28 2:21 ` Josh Poimboeuf
2018-01-28 8:22 ` tip-bot for Josh Poimboeuf [this message]
2018-01-28 8:50 ` Borislav Petkov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=tip-dd085168a74c99c3ebe7f813069e412eb8444243@git.kernel.org \
--to=tipbot@zytor.com \
--cc=bp@alien8.de \
--cc=hpa@zytor.com \
--cc=jpoimboe@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-tip-commits@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).