Messages in this thread Patch in this message | | | Date | Fri, 18 Oct 2019 16:30:27 -0000 | From | "tip-bot2 for Jiri Slaby" <> | Subject | [tip: x86/asm] x86/asm/ftrace: Mark function_hook as function |
| |
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 <jslaby@suse.cz> AuthorDate: Fri, 11 Oct 2019 13:51:01 +02:00 Committer: Borislav Petkov <bp@suse.de> 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 <jslaby@suse.cz> Signed-off-by: Borislav Petkov <bp@suse.de> Cc: "H. Peter Anvin" <hpa@zytor.com> Cc: Ingo Molnar <mingo@redhat.com> Cc: Josh Poimboeuf <jpoimboe@redhat.com> Cc: linux-arch@vger.kernel.org Cc: Masami Hiramatsu <mhiramat@kernel.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: "Steven Rostedt (VMware)" <rostedt@goodmis.org> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: x86-ml <x86@kernel.org> 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)
| |