From nobody Tue Dec 16 20:32:27 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 D3714C77B60 for ; Mon, 24 Apr 2023 00:18:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230134AbjDXART (ORCPT ); Sun, 23 Apr 2023 20:17:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:50742 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230121AbjDXARN (ORCPT ); Sun, 23 Apr 2023 20:17:13 -0400 Received: from mga07.intel.com (mga07.intel.com [134.134.136.100]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id D771BAA for ; Sun, 23 Apr 2023 17:17:11 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1682295431; x=1713831431; h=from:to:cc:subject:date:message-id:in-reply-to: references; bh=zQzAyc+oLBHOEgweof17wjj2fy/1ScIcJB+YP8+nzTQ=; b=anVtz89ImrfgENVeGigQhcMz6rSIzR4jpNADDbxqZLejj3O+/vnU0o8U KY+G0jcPEWddi75widwYTcCLrPF4RfPS8WniW6blUzFeEqb/U2Yy7sk4M c56w9TE9RAmk/LP7tYoEhTVG4LgCYOsdTVzhKcFwh/7LjWrMZp2k84INW gXWvLG4aErsCbjPaeTfCdotKz3kGxpuBXgHz7V0Ge/ckfNuYr6anL+miD onldWkRQ89sGxKxXNui5PutWIkNsFJMV9yZpleEFgQ8ZaEwjSkcDxdIoS 6vNrmDzAmsFzp1Ry5/0qdLIo4qflfAFVWxnpxcx+TpJIOXwlpggRtXJR2 g==; X-IronPort-AV: E=McAfee;i="6600,9927,10689"; a="411605283" X-IronPort-AV: E=Sophos;i="5.99,221,1677571200"; d="scan'208";a="411605283" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga105.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Apr 2023 17:17:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10689"; a="1022502126" X-IronPort-AV: E=Sophos;i="5.99,221,1677571200"; d="scan'208";a="1022502126" Received: from ranerica-svr.sc.intel.com ([172.25.110.23]) by fmsmga005.fm.intel.com with ESMTP; 23 Apr 2023 17:17:10 -0700 From: Ricardo Neri To: x86@kernel.org Cc: Andreas Herrmann , Chen Yu , Len Brown , Pu Wen , "Rafael J. Wysocki" , Srinivas Pandruvada , Zhang Rui , Ricardo Neri , linux-kernel@vger.kernel.org, Ricardo Neri Subject: [PATCH v2 2/2] x86/cacheinfo: Clean out init_cache_level() Date: Sun, 23 Apr 2023 17:19:56 -0700 Message-Id: <20230424001956.21434-3-ricardo.neri-calderon@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20230424001956.21434-1-ricardo.neri-calderon@linux.intel.com> References: <20230424001956.21434-1-ricardo.neri-calderon@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" init_cache_level() no longer has a purpose on x86. It no longer needs to set num_leaves, and it never had to set num_levels, which was unnecessary on x86. Replace it with "return 0" simply to override the weak function, which would return an error. Cc: Andreas Herrmann Cc: Chen Yu Cc: Len Brown Cc: Pu Wen Cc: "Rafael J. Wysocki" Cc: Srinivas Pandruvada Cc: Zhang Rui Reviewed-by: Len Brown Signed-off-by: Ricardo Neri --- Changes since v1: * Introduced this patch. --- arch/x86/kernel/cpu/cacheinfo.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/x86/kernel/cpu/cacheinfo.c b/arch/x86/kernel/cpu/cacheinf= o.c index 45c4e9daf3f1..454247e459b1 100644 --- a/arch/x86/kernel/cpu/cacheinfo.c +++ b/arch/x86/kernel/cpu/cacheinfo.c @@ -1006,11 +1006,6 @@ static void ci_leaf_init(struct cacheinfo *this_leaf, =20 int init_cache_level(unsigned int cpu) { - struct cpu_cacheinfo *this_cpu_ci =3D get_cpu_cacheinfo(cpu); - - if (!this_cpu_ci) - return -EINVAL; - this_cpu_ci->num_levels =3D 3; return 0; } =20 --=20 2.25.1