From nobody Sun Oct 02 04:29:13 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Mg9w93MnPz4dsg1; Sun, 2 Oct 2022 04:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mg9w92rSQz438q; Sun, 2 Oct 2022 04:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AE7It2LUs1GfW7n3RqpryUjnjvzLUnfblFQ8W6Re+44=; b=HO6Wx+x/8x+FLCgBHmiaKGxbsa3lPop1Xna16wVupi+VkOoO+4Cvva39f4q5TZuCWfNA1A z0nZZWEZFRJWb1UW3/R+wH89YlZ5OmPv2A4Eo8SESr+y80zwgGQxdhpdajR6EGsqpUB/Qp Un4ZAciJK7gXSFxGd53ChMakVaFNtoJWwryWEclSOqmJFlgwKkDpf2d8vitRSMhNicRcUz iqGTD3HD7G15FQ6NJ0lgl+mKF2QhTXWR9PxUKB4te5gG9ITxDKxVCIXczWrwVH8FPLW7EH JX8hC8sWZCwKWjb2/yGtd/csacsa0Izr2nkzJKrPPWrte/7yiNsORkSZfxqC2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Mg9w91jL1zlKF; Sun, 2 Oct 2022 04:29:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2924TDhp057868; Sun, 2 Oct 2022 04:29:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2924TDAZ057867; Sun, 2 Oct 2022 04:29:13 GMT (envelope-from git) Date: Sun, 2 Oct 2022 04:29:13 GMT Message-Id: <202210020429.2924TDAZ057867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 8de3643a861b - stable/13 - get_cachetype_cp15: eliminate write only multilier List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8de3643a861b569345c3eb71f5742a0b7fb9365f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664684953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AE7It2LUs1GfW7n3RqpryUjnjvzLUnfblFQ8W6Re+44=; b=DmkjKDHdjwbtT7YizmEeyzd/sso8sUeRwsD98/qp/6FEZGl6KaRQq9XtC7lozqfeEO5gTj U5dja4Bwr6YhdI5Be/21QPIGfnORb/sFOYqoa5OnJTyYMuRJXekx8C0D8pHKttbTq+gM9l ph7/ww0seGihSWYkzxBN5wAmuPwYWvst6PaUYpGG4l+oZ0SNWj0kE7GpMPMqganX6/4oC6 YvUiIWHtwLchO2pDNuRUIlqoXas/omNJ9VqD/6bGEpRk9XH2zQquSZuBrpTeApSxoSkn0B Tt1ioPuxiVu6x6A6tctp9JFJlUgT+8+pRZvV64f+OYcqVlnu3ZkDH/5F7Fy2zA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664684953; a=rsa-sha256; cv=none; b=JEIDaiQ7ENgQxw4Ar4qoGpZmXgvUDwkEuMdd5AHIy+xxZy/Wy3T15LoUWVkOVY+nYIF8EW I0l3uoCvegOUIHaNnyDOlX4UIAkQaplewysqh7XrssyjsDx2F9eWT4LH3OCsqrv0ZV10s2 IgqOM3WDuk31OWPP4q00fI438gXIDxZM+H7X/GvNeDNiMvaMGZIXQaEsWS+6fn3goOoHVy b4+8JSBctszodzvyluY1WIKmsgkpF1JVvAScP/9gV2ImUoy/Z6mwmKXzdIsjGjKkooN8aO vNsQlgRwPE4ZsQRIyRdQez3hZkJfYMsnyEB5L4v3ib5ThsXMbeEqtauCZEbQnQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8de3643a861b569345c3eb71f5742a0b7fb9365f commit 8de3643a861b569345c3eb71f5742a0b7fb9365f Author: Warner Losh AuthorDate: 2022-07-08 17:53:28 +0000 Commit: Warner Losh CommitDate: 2022-10-02 04:25:50 +0000 get_cachetype_cp15: eliminate write only multilier Sponsored by: Netflix (cherry picked from commit 97663c8d9e898d176d0b36dcd35f30ec1b874d2f) --- sys/arm/arm/cpufunc.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/arm/arm/cpufunc.c b/sys/arm/arm/cpufunc.c index 3f773a3ece72..7a857f8997e9 100644 --- a/sys/arm/arm/cpufunc.c +++ b/sys/arm/arm/cpufunc.c @@ -146,7 +146,6 @@ get_cachetype_cp15(void) { u_int ctype, dsize, cpuid; u_int clevel, csize, i, sel; - u_int multiplier; u_char type; ctype = cp15_ctr_get(); @@ -193,7 +192,6 @@ get_cachetype_cp15(void) */ dsize = CPU_CT_DSIZE(ctype); - multiplier = (dsize & CPU_CT_xSIZE_M) ? 3 : 2; arm_dcache_align = 1U << (CPU_CT_xSIZE_LEN(dsize) + 3); if (CPU_CT_xSIZE_ASSOC(dsize) == 0) { if (dsize & CPU_CT_xSIZE_M)