From nobody Fri Dec 19 06:17:51 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3562FC83F2D for ; Sat, 2 Sep 2023 11:51:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1352076AbjIBLvb (ORCPT ); Sat, 2 Sep 2023 07:51:31 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42988 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1352092AbjIBLvR (ORCPT ); Sat, 2 Sep 2023 07:51:17 -0400 Received: from sin.source.kernel.org (sin.source.kernel.org [IPv6:2604:1380:40e1:4800::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7B8C710F9 for ; Sat, 2 Sep 2023 04:51:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by sin.source.kernel.org (Postfix) with ESMTPS id D5F89CE25CC for ; Sat, 2 Sep 2023 11:51:09 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 49BBCC433C8; Sat, 2 Sep 2023 11:51:08 +0000 (UTC) Received: from rostedt by gandalf with local (Exim 4.96) (envelope-from ) id 1qcP9s-000K0e-0u; Sat, 02 Sep 2023 07:51:20 -0400 Message-ID: <20230902115120.096623405@goodmis.org> User-Agent: quilt/0.66 Date: Sat, 02 Sep 2023 07:50:45 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org Cc: Masami Hiramatsu , Mark Rutland , Andrew Morton , Valentin Schneider Subject: [for-linus][PATCH 10/11] tracing/filters: Change parse_pred() cpulist ternary into an if block References: <20230902115035.786076237@goodmis.org> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Valentin Schneider Review comments noted that an if block would be clearer than a ternary, so swap it out. No change in behaviour intended Link: https://lkml.kernel.org/r/20230901151039.125186-4-vschneid@redhat.com Cc: Masami Hiramatsu Signed-off-by: Valentin Schneider Signed-off-by: Steven Rostedt (Google) --- kernel/trace/trace_events_filter.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/kernel/trace/trace_events_filter.c b/kernel/trace/trace_events= _filter.c index eb331e8b00b6..09b4733a2933 100644 --- a/kernel/trace/trace_events_filter.c +++ b/kernel/trace/trace_events_filter.c @@ -1782,13 +1782,17 @@ static int parse_pred(const char *str, void *data, FILTER_PRED_FN_CPUMASK; } else if (field->filter_type =3D=3D FILTER_CPU) { if (single) { - pred->op =3D pred->op =3D=3D OP_BAND ? OP_EQ : pred->op; + if (pred->op =3D=3D OP_BAND) + pred->op =3D OP_EQ; + pred->fn_num =3D FILTER_PRED_FN_CPU; } else { pred->fn_num =3D FILTER_PRED_FN_CPU_CPUMASK; } } else if (single) { - pred->op =3D pred->op =3D=3D OP_BAND ? OP_EQ : pred->op; + if (pred->op =3D=3D OP_BAND) + pred->op =3D OP_EQ; + pred->fn_num =3D select_comparison_fn(pred->op, field->size, false); if (pred->op =3D=3D OP_NE) pred->not =3D 1; --=20 2.40.1