From: Peter Zijlstra Date: Wed, 11 Oct 2017 07:45:31 +0000 (+0200) Subject: perf/ftrace: Small cleanup X-Git-Tag: v4.15-rc1~52^2~3 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1dd311e6dcda4020c603bcf9f390a577d439d509;p=thirdparty%2Fkernel%2Flinux.git perf/ftrace: Small cleanup 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 Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Steven Rostedt (VMware) --- diff --git a/kernel/trace/trace_event_perf.c b/kernel/trace/trace_event_perf.c index e73f9ab15939b..55d6dff37dafa 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;