From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932743AbdJKIIs (ORCPT ); Wed, 11 Oct 2017 04:08:48 -0400 Received: from bombadil.infradead.org ([65.50.211.133]:38208 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757252AbdJKIGU (ORCPT ); Wed, 11 Oct 2017 04:06:20 -0400 Message-Id: <20171011080224.315585202@infradead.org> User-Agent: quilt/0.63-1 Date: Wed, 11 Oct 2017 09:45:31 +0200 From: Peter Zijlstra To: rostedt@goodmis.org, mingo@kernel.org Cc: linux-kernel@vger.kernel.org, jolsa@kernel.org, zhouchengming1@huawei.com, peterz@infradead.org Subject: [PATCH 3/4] perf/ftrace: Small cleanup References: <20171011074528.764500836@infradead.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline; filename=peterz-perf-trace-cleanup.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org ops->flags _should_ be 0 at this point, so setting the flag using bitwise or is a bit daft. Requested-by: Steven Rostedt Signed-off-by: Peter Zijlstra (Intel) --- kernel/trace/trace_event_perf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/kernel/trace/trace_event_perf.c +++ b/kernel/trace/trace_event_perf.c @@ -362,7 +362,7 @@ static int perf_ftrace_function_register { 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;