aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiri Slaby <[email protected]>2019-10-11 13:51:01 +0200
committerBorislav Petkov <[email protected]>2019-10-18 11:35:41 +0200
commitf13ad88a984e8090226a8f62d75e87b770eefdf4 (patch)
tree50ba09643301facd16b3046d9cd04ccdb8161aa6
parentef1e03152cb027d5925646d4d1772ced7595292f (diff)
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 <[email protected]> Signed-off-by: Borislav Petkov <[email protected]> Cc: "H. Peter Anvin" <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Josh Poimboeuf <[email protected]> Cc: [email protected] Cc: Masami Hiramatsu <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: "Steven Rostedt (VMware)" <[email protected]> Cc: Thomas Gleixner <[email protected]> Cc: x86-ml <[email protected]> Link: https://lkml.kernel.org/r/[email protected]
-rw-r--r--arch/x86/kernel/ftrace_32.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/kernel/ftrace_32.S b/arch/x86/kernel/ftrace_32.S
index e0061dc976e1..219be1309c37 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)