From patchwork Tue Aug 1 15:56:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Reaver X-Patchwork-Id: 129369 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:918b:0:b0:3e4:2afc:c1 with SMTP id s11csp2791189vqg; Tue, 1 Aug 2023 09:39:25 -0700 (PDT) X-Google-Smtp-Source: APBJJlH5PST9aY8lld+CMPFBOMsWqZCznXPLN0TMNeBcXEE2RWB3k+0Raae8NkI5ww3x+O9BTbLE X-Received: by 2002:a05:6a00:3983:b0:686:dd81:394c with SMTP id fi3-20020a056a00398300b00686dd81394cmr13431691pfb.15.1690907965432; Tue, 01 Aug 2023 09:39:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1690907965; cv=none; d=google.com; s=arc-20160816; b=yN2aCxHeE93nKyT1KRB73bmEwBz0Em0UwNanjd9r6OcG0nqFmoTz7+F27b0SB+QOtE V1JoRucw3s04PuM/MXVT1QbiJFiu6U5KIdzPwrfR19TPa7Xlg0oWIPaa0+R5LsUtkJFZ VOCpo49rIzurpFSidbU+wVdW+xD33VVcVO0XPnh5aM7LQpwpxLfskIAXJg5SZvxSM2CN g0hGcvozR9beQN8mkfYOwCFwTQ87tUWQ7SfL9w0aawJsChBhGoHcWxRCda1iAbV+0JOR tlfhzTuwdnR+6xnK+WT31Q0mrV1ONpRjAOrCEvaD0XwNT/ALXWQlckxTmLs49qToNWvj OYsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:feedback-id:dkim-signature :dkim-signature; bh=ty2Jg2JcDl1vsDdHl2O0KnSHDnTuySWYs7sri+QdDRE=; fh=08tGUR7826yVXXp79A58dp9Md3ZC0GhUsrI37SGUAYc=; b=PnzREnSblZtagaTrlIVMlYBh5DuYbum+f/pyl2h1BcA/UJGIkEBGOW+5hC2+NP7T1n qk+UGBFPbnCWHx303XesPPSZOOAc0avq2LsoPiBEf+W/WSOlc/hZT6EistT3+Cmaa5aV 1T4BE8iBweK7JUpQWv89QVkF9TvYTIPPitmGBPaCLJ+EF3zO5mmbwMT2yx/bnnoUB7vg DOdJ3M9qaYjBtWDfwC21yspEV4S9cA7GzKCOyXt859lNZ4JEe4CiXco3u7OXSaHYNvF9 lZuwuz8IhI/1Ys6IQnOQMcpZD3snPAPGXEgAbXKXQy/WUAr1BpxhvYswZOKu4DNa9wgS 7aNA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@davidreaver.com header.s=fm3 header.b=y5QYxcon; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b="wDKJzvE/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id y67-20020a636446000000b0053fb354c191si1675403pgb.861.2023.08.01.09.39.11; Tue, 01 Aug 2023 09:39:25 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@davidreaver.com header.s=fm3 header.b=y5QYxcon; dkim=pass header.i=@messagingengine.com header.s=fm3 header.b="wDKJzvE/"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233483AbjHAP5c (ORCPT + 99 others); Tue, 1 Aug 2023 11:57:32 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38818 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232545AbjHAP5b (ORCPT ); Tue, 1 Aug 2023 11:57:31 -0400 Received: from out2-smtp.messagingengine.com (out2-smtp.messagingengine.com [66.111.4.26]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89FCD1999; Tue, 1 Aug 2023 08:57:15 -0700 (PDT) Received: from compute6.internal (compute6.nyi.internal [10.202.2.47]) by mailout.nyi.internal (Postfix) with ESMTP id D192A5C00FB; Tue, 1 Aug 2023 11:57:14 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute6.internal (MEProxy); Tue, 01 Aug 2023 11:57:14 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=davidreaver.com; h=cc:cc:content-transfer-encoding:content-type:date:date:from :from:in-reply-to:message-id:mime-version:reply-to:sender :subject:subject:to:to; s=fm3; t=1690905434; x=1690991834; bh=ty 2Jg2JcDl1vsDdHl2O0KnSHDnTuySWYs7sri+QdDRE=; b=y5QYxconx2yNgUnGRd qWNidKlBBWnkxxusQK/EVP7tcJAM3buOWza73ay6fnKJOkRlTJ8l11qzJ4V7Vh00 leNF1jpqP5poLDtua3QXuquLJT6UoMRgAZY6H+3JVpP2IzCZFoPKSNWE6wSM6jHL qVGuQyCnZOJ7zMAhUxsH5vhOxxT1CLyDFMNUuHYSHEqAu9Q6DxxZqlKIxdSRFaU+ WR2Fio8BFyD/5EKlRY3lh02+dEl9dHeTl2T5kDdPY8uBmfJyf7WE3Ov8hjbU0vys 20uFwB6N+eR7053yxMgHpYMxZs/AuB1q6XY1FQ+hCOILg1Pa8cSH8PdprOrpV/eE pifQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-transfer-encoding :content-type:date:date:feedback-id:feedback-id:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm3; t=1690905434; x=1690991834; bh=ty2Jg2JcDl1vs DdHl2O0KnSHDnTuySWYs7sri+QdDRE=; b=wDKJzvE/xGU2KZr6wCLJO+4kaHY6p DSbcMmzrZY7TL0h3Nc/ck3TO7+r110tKikjz53D1UddibQjMu/94Fq7DYHcTQoA2 2RwmC5BwBMpu8epWsWXDh8TscEVNmDYplsy1ea/+3QuOi1qmB6wEVR6yMZURdI+C wRMLNlgvTLHmqBaLNEt/0E8vUnrjzGhZX+cdy1ODjlWOpYaeguZn7ZxujHNN2onw Y8l0086PLuVKxfCexV9BEocxhb6OtMgvI0+iAE/U7i/Caglbibg5Hmrzt1mduNXh /wts5At+5nRoa4wiGuM3CoRkMAKKXfWUrc/Y2oTA40wvkYeSaTWDU+qaw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedviedrjeeigdelvdcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecusecvtfgvtghiphhivghnthhsucdlqddutddtmdenuc fjughrpefhvfevufffkffoggfgsedtkeertdertddtnecuhfhrohhmpeffrghvihguucft vggrvhgvrhcuoehmvgesuggrvhhiughrvggrvhgvrhdrtghomheqnecuggftrfgrthhtvg hrnhepvddvieefleeggfeftdejtdffheeuieffheejgefgffejveduueeugeetkeehjedv necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepmhgvse gurghvihgurhgvrghvvghrrdgtohhm X-ME-Proxy: Feedback-ID: i67e946c9:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Tue, 1 Aug 2023 11:57:11 -0400 (EDT) From: David Reaver To: Arnaldo Carvalho de Melo , Thomas Gleixner , Borislav Petkov , Dave Hansen Cc: Peter Zijlstra , Ingo Molnar , Mark Rutland , Alexander Shishkin , Jiri Olsa , Namhyung Kim , Ian Rogers , Adrian Hunter , x86@kernel.org, "H. Peter Anvin" , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-janitors@vger.kernel.org, David Reaver Subject: [PATCH] perf/x86/rapl: fix Using plain integer as NULL pointer warning Date: Tue, 1 Aug 2023 08:56:51 -0700 Message-ID: <20230801155651.108076-1-me@davidreaver.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_BLOCKED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_PASS,SPF_PASS, T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1773045510760524935 X-GMAIL-MSGID: 1773045510760524935 Change 0 to NULL when initializing the test field of perf_msr structs to avoid the following sparse warnings: make C=2 arch/x86/events/rapl.o CHECK arch/x86/events/rapl.c ... arch/x86/events/rapl.c:540:59: warning: Using plain integer as NULL pointer arch/x86/events/rapl.c:542:59: warning: Using plain integer as NULL pointer arch/x86/events/rapl.c:543:59: warning: Using plain integer as NULL pointer arch/x86/events/rapl.c:544:59: warning: Using plain integer as NULL pointer Signed-off-by: David Reaver --- arch/x86/events/rapl.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/arch/x86/events/rapl.c b/arch/x86/events/rapl.c index 52e6e7ed4f78..ae21bb2ff0ff 100644 --- a/arch/x86/events/rapl.c +++ b/arch/x86/events/rapl.c @@ -537,11 +537,11 @@ static struct perf_msr intel_rapl_spr_msrs[] = { * - want to use same event codes across both architectures */ static struct perf_msr amd_rapl_msrs[] = { - [PERF_RAPL_PP0] = { 0, &rapl_events_cores_group, 0, false, 0 }, + [PERF_RAPL_PP0] = { 0, &rapl_events_cores_group, NULL, false, 0 }, [PERF_RAPL_PKG] = { MSR_AMD_PKG_ENERGY_STATUS, &rapl_events_pkg_group, test_msr, false, RAPL_MSR_MASK }, - [PERF_RAPL_RAM] = { 0, &rapl_events_ram_group, 0, false, 0 }, - [PERF_RAPL_PP1] = { 0, &rapl_events_gpu_group, 0, false, 0 }, - [PERF_RAPL_PSYS] = { 0, &rapl_events_psys_group, 0, false, 0 }, + [PERF_RAPL_RAM] = { 0, &rapl_events_ram_group, NULL, false, 0 }, + [PERF_RAPL_PP1] = { 0, &rapl_events_gpu_group, NULL, false, 0 }, + [PERF_RAPL_PSYS] = { 0, &rapl_events_psys_group, NULL, false, 0 }, }; static int rapl_cpu_offline(unsigned int cpu)