From: Namhyung Kim <namhyung@kernel.org>
To: Steven Rostedt <rostedt@goodmis.org>
Cc: x86@kernel.org, Thomas Gleixner <tglx@linutronix.de>,
Ingo Molnar <mingo@kernel.org>,
"H. Peter Anvin" <hpa@linux.intel.com>,
LKML <linux-kernel@vger.kernel.org>
Subject: [PATCH] ftrace/x86: Fix missing ops arg on static function tracing
Date: Sat, 14 Nov 2015 18:32:28 +0900 [thread overview]
Message-ID: <1447493548-31978-1-git-send-email-namhyung@kernel.org> (raw)
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@kernel.org>
---
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
next reply other threads:[~2015-11-14 9:32 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-14 9:32 Namhyung Kim [this message]
2015-11-16 15:54 ` [PATCH] ftrace/x86: Fix missing ops arg on static function tracing Steven Rostedt
2015-11-16 15:57 ` Steven Rostedt
2015-11-16 16:25 ` Steven Rostedt
2015-11-16 23:44 ` Namhyung Kim
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1447493548-31978-1-git-send-email-namhyung@kernel.org \
--to=namhyung@kernel.org \
--cc=hpa@linux.intel.com \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=rostedt@goodmis.org \
--cc=tglx@linutronix.de \
--cc=x86@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.