[PATCH] ftrace/x86: Fix missing ops arg on static function tracing

[Namhyung Kim]

The commit f1ab00af816e ("ftrace/x86: Get rid of ftrace_caller_setup")
moved code that loads ftrace_ops into 3rd parameter but it missed to do
for static tracing.

Signed-off-by: Namhyung Kim <namhyung@xxxxxxxxxx>
---
 arch/x86/kernel/mcount_64.S | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/x86/kernel/mcount_64.S b/arch/x86/kernel/mcount_64.S
index 94ea120fa21f..6c1ccf9e5427 100644
--- a/arch/x86/kernel/mcount_64.S
+++ b/arch/x86/kernel/mcount_64.S
@@ -278,6 +278,9 @@ trace:
 	/* save_mcount_regs fills in first two parameters */
 	save_mcount_regs
 
+	/* Load the ftrace_ops into the 3rd parameter */
+	movq function_trace_op(%rip), %rdx
+
 	call   *ftrace_trace_function
 
 	restore_mcount_regs
-- 
2.6.2

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/