lkml.org 
[lkml]   [2017]   [Oct]   [2]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
Patch in this message
/
From
Subject[PATCH v4 20/27] x86: ftrace, mark function_hook as function
Date
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>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: x86@kernel.org
---
arch/x86/kernel/ftrace_32.S | 4 ++--
arch/x86/kernel/ftrace_64.S | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/arch/x86/kernel/ftrace_32.S b/arch/x86/kernel/ftrace_32.S
index d97edccbd655..58bb9ff44cf4 100644
--- a/arch/x86/kernel/ftrace_32.S
+++ b/arch/x86/kernel/ftrace_32.S
@@ -29,9 +29,9 @@ EXPORT_SYMBOL(mcount)
# 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)

diff --git a/arch/x86/kernel/ftrace_64.S b/arch/x86/kernel/ftrace_64.S
index 399691302923..1ce977394fbe 100644
--- a/arch/x86/kernel/ftrace_64.S
+++ b/arch/x86/kernel/ftrace_64.S
@@ -145,9 +145,9 @@ EXPORT_SYMBOL(mcount)

#ifdef CONFIG_DYNAMIC_FTRACE

-ENTRY(function_hook)
+SYM_FUNC_START(function_hook)
retq
-END(function_hook)
+SYM_FUNC_END(function_hook)

ENTRY(ftrace_caller)
/* save_mcount_regs fills in first two parameters */
--
2.14.2
\
 
 \ /
  Last update: 2017-10-02 11:17    [W:0.177 / U:2.824 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site