From mboxrd@z Thu Jan 1 00:00:00 1970 From: "tip-bot2 for Jiri Slaby" Subject: [tip: x86/asm] x86/asm/ftrace: Mark function_hook as function Date: Fri, 18 Oct 2019 16:30:27 -0000 Message-ID: <157141622788.29376.4016565749507481510.tip-bot2@tip-bot2> References: <20191011115108.12392-22-jslaby@suse.cz> Reply-To: linux-kernel@vger.kernel.org Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20191011115108.12392-22-jslaby@suse.cz> Sender: linux-kernel-owner@vger.kernel.org To: linux-tip-commits@vger.kernel.org Cc: Jiri Slaby , Borislav Petkov , "H. Peter Anvin" , Ingo Molnar , Josh Poimboeuf , linux-arch@vger.kernel.org, Masami Hiramatsu , Peter Zijlstra , "Steven Rostedt (VMware)" , Thomas Gleixner , x86-ml , Ingo Molnar , Borislav Petkov , linux-kernel@vger.kernel.org List-Id: linux-arch.vger.kernel.org The following commit has been merged into the x86/asm branch of tip: Commit-ID: f13ad88a984e8090226a8f62d75e87b770eefdf4 Gitweb: https://git.kernel.org/tip/f13ad88a984e8090226a8f62d75e87b770eefdf4 Author: Jiri Slaby AuthorDate: Fri, 11 Oct 2019 13:51:01 +02:00 Committer: Borislav Petkov CommitterDate: Fri, 18 Oct 2019 11:35:41 +02:00 x86/asm/ftrace: Mark function_hook as function Relabel function_hook to be marked really as a function. It is called from C and has the same expectations towards the stack etc. Signed-off-by: Jiri Slaby Signed-off-by: Borislav Petkov Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Josh Poimboeuf Cc: linux-arch@vger.kernel.org Cc: Masami Hiramatsu Cc: Peter Zijlstra Cc: "Steven Rostedt (VMware)" Cc: Thomas Gleixner Cc: x86-ml Link: https://lkml.kernel.org/r/20191011115108.12392-22-jslaby@suse.cz --- arch/x86/kernel/ftrace_32.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/ftrace_32.S b/arch/x86/kernel/ftrace_32.S index e0061dc..219be13 100644 --- a/arch/x86/kernel/ftrace_32.S +++ b/arch/x86/kernel/ftrace_32.S @@ -21,9 +21,9 @@ EXPORT_SYMBOL(__fentry__) # define MCOUNT_FRAME 0 /* using frame = false */ #endif -ENTRY(function_hook) +SYM_FUNC_START(function_hook) ret -END(function_hook) +SYM_FUNC_END(function_hook) ENTRY(ftrace_caller) From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from Galois.linutronix.de ([193.142.43.55]:57613 "EHLO Galois.linutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2439672AbfJRQam (ORCPT ); Fri, 18 Oct 2019 12:30:42 -0400 Date: Fri, 18 Oct 2019 16:30:27 -0000 From: "tip-bot2 for Jiri Slaby" Reply-to: linux-kernel@vger.kernel.org Subject: [tip: x86/asm] x86/asm/ftrace: Mark function_hook as function In-Reply-To: <20191011115108.12392-22-jslaby@suse.cz> References: <20191011115108.12392-22-jslaby@suse.cz> MIME-Version: 1.0 Message-ID: <157141622788.29376.4016565749507481510.tip-bot2@tip-bot2> Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Sender: linux-arch-owner@vger.kernel.org List-ID: To: linux-tip-commits@vger.kernel.org Cc: Jiri Slaby , Borislav Petkov , "H. Peter Anvin" , Ingo Molnar , Josh Poimboeuf , linux-arch@vger.kernel.org, Masami Hiramatsu , Peter Zijlstra , "Steven Rostedt (VMware)" , Thomas Gleixner , x86-ml , Ingo Molnar , Borislav Petkov , linux-kernel@vger.kernel.org Message-ID: <20191018163027.cKbGn9LUQT2J4zBHUKVU4OsObK2w6S1R9nBLi4P3Y6w@z> The following commit has been merged into the x86/asm branch of tip: Commit-ID: f13ad88a984e8090226a8f62d75e87b770eefdf4 Gitweb: https://git.kernel.org/tip/f13ad88a984e8090226a8f62d75e87b770eefdf4 Author: Jiri Slaby AuthorDate: Fri, 11 Oct 2019 13:51:01 +02:00 Committer: Borislav Petkov CommitterDate: Fri, 18 Oct 2019 11:35:41 +02:00 x86/asm/ftrace: Mark function_hook as function Relabel function_hook to be marked really as a function. It is called from C and has the same expectations towards the stack etc. Signed-off-by: Jiri Slaby Signed-off-by: Borislav Petkov Cc: "H. Peter Anvin" Cc: Ingo Molnar Cc: Josh Poimboeuf Cc: linux-arch@vger.kernel.org Cc: Masami Hiramatsu Cc: Peter Zijlstra Cc: "Steven Rostedt (VMware)" Cc: Thomas Gleixner Cc: x86-ml Link: https://lkml.kernel.org/r/20191011115108.12392-22-jslaby@suse.cz --- arch/x86/kernel/ftrace_32.S | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/x86/kernel/ftrace_32.S b/arch/x86/kernel/ftrace_32.S index e0061dc..219be13 100644 --- a/arch/x86/kernel/ftrace_32.S +++ b/arch/x86/kernel/ftrace_32.S @@ -21,9 +21,9 @@ EXPORT_SYMBOL(__fentry__) # define MCOUNT_FRAME 0 /* using frame = false */ #endif -ENTRY(function_hook) +SYM_FUNC_START(function_hook) ret -END(function_hook) +SYM_FUNC_END(function_hook) ENTRY(ftrace_caller)