From: Steven Rostedt <rostedt@goodmis.org>
To: linux-kernel@vger.kernel.org
Cc: Ingo Molnar <mingo@kernel.org>,
Andrew Morton <akpm@linux-foundation.org>,
"Peter Zijlstra (Intel)" <peterz@infradead.org>
Subject: [for-next][PATCH 4/7] perf/ftrace: Small cleanup
Date: Wed, 18 Oct 2017 09:28:11 -0400 [thread overview]
Message-ID: <20171018132838.119226872@goodmis.org> (raw)
In-Reply-To: 20171018132807.255017131@goodmis.org
[-- Attachment #1: 0004-perf-ftrace-Small-cleanup.patch --]
[-- Type: text/plain, Size: 990 bytes --]
From: Peter Zijlstra <peterz@infradead.org>
ops->flags _should_ be 0 at this point, so setting the flag using
bitwise or is a bit daft.
Link: http://lkml.kernel.org/r/20171011080224.315585202@infradead.org
Requested-by: Steven Rostedt <rostedt@goodmis.org>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
kernel/trace/trace_event_perf.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c
index e73f9ab15939..55d6dff37daf 100644
--- a/kernel/trace/trace_event_perf.c
+++ b/kernel/trace/trace_event_perf.c
@@ -363,7 +363,7 @@ static int perf_ftrace_function_register(struct perf_event *event)
{
struct ftrace_ops *ops = &event->ftrace_ops;
- ops->flags |= FTRACE_OPS_FL_RCU;
+ ops->flags = FTRACE_OPS_FL_RCU;
ops->func = perf_ftrace_function_call;
ops->private = (void *)(unsigned long)nr_cpu_ids;
--
2.13.2
next prev parent reply other threads:[~2017-10-18 13:29 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-10-18 13:28 [for-next][PATCH 0/7] tracing: Some more updates for 4.15 Steven Rostedt
2017-10-18 13:28 ` [for-next][PATCH 2/7] perf/ftrace: Revert ("perf/ftrace: Fix double traces of perf on ftrace:function") Steven Rostedt
2017-10-18 13:28 ` [for-next][PATCH 3/7] perf/ftrace: Fix function trace events Steven Rostedt
2017-10-18 13:28 ` Steven Rostedt [this message]
2017-10-18 13:28 ` [for-next][PATCH 5/7] ftrace: Kill FTRACE_OPS_FL_PER_CPU Steven Rostedt
2017-10-18 13:28 ` [for-next][PATCH 6/7] tracing, thermal: Hide devfreq trace events when not in use Steven Rostedt
2017-10-18 13:28 ` [for-next][PATCH 7/7] tracing, thermal: Hide cpu cooling " Steven Rostedt
[not found] ` <20171018132837.670484526@goodmis.org>
2017-10-18 15:43 ` [for-next][PATCH 1/7] tracing, dma-buf: Remove unused trace event dma_fence_annotate_wait_on Steven Rostedt
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=20171018132838.119226872@goodmis.org \
--to=rostedt@goodmis.org \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@kernel.org \
--cc=peterz@infradead.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox