From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752312AbeA1IZ0 (ORCPT ); Sun, 28 Jan 2018 03:25:26 -0500 Received: from terminus.zytor.com ([65.50.211.136]:48901 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751577AbeA1IZY (ORCPT ); Sun, 28 Jan 2018 03:25:24 -0500 Date: Sun, 28 Jan 2018 00:22:03 -0800 From: tip-bot for Josh Poimboeuf Message-ID: 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 Reply-To: tglx@linutronix.de, mingo@kernel.org, rostedt@goodmis.org, torvalds@linux-foundation.org, hpa@zytor.com, bp@alien8.de, linux-kernel@vger.kernel.org, jpoimboe@redhat.com In-Reply-To: <20180128022150.dqierscqmt3uwwsr@treble> References: <20180128022150.dqierscqmt3uwwsr@treble> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/urgent] x86/ftrace: Add one more ENDPROC annotation Git-Commit-ID: dd085168a74c99c3ebe7f813069e412eb8444243 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: dd085168a74c99c3ebe7f813069e412eb8444243 Gitweb: https://git.kernel.org/tip/dd085168a74c99c3ebe7f813069e412eb8444243 Author: Josh Poimboeuf AuthorDate: Sat, 27 Jan 2018 20:21:50 -0600 Committer: Thomas Gleixner 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 Reported-by: Borislav Petkov Signed-off-by: Josh Poimboeuf Signed-off-by: Thomas Gleixner Acked-by: Ingo Molnar Cc: Linus Torvalds 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