From nobody Tue Apr 05 04:32:00 2022 X-Original-To: dev-commits-src-main@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 C16B31A8FAFE; Tue, 5 Apr 2022 04:32:01 +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 4KXZVT1p7Nz4g4R; Tue, 5 Apr 2022 04:32:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649133121; 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=+g/RxVEsjcRwz2Bm+PaPdkM2y56HgY40Zbo+odkPYtU=; b=NhOQyYR7yifub74qAg0d4aUKSZ867EpKISVn32F5Mtn/B4Tg3n97TLz6Ivkc9w9J8Rq13w SoQgy4JmPS/GlwpW8jmhHRpG9+H6PbFnFIIQ2Sfbde67gceb2CQUqBAhu0xgZ8lF8YIvKw wzAdBYM4Mx7HOvjFT+AAVhd5klA3gQ5Z3NZjl2lUNEqPlZJFcqTBqHJqbDuhrl3r9cQwl9 B7vPkICSJY0YXax/g9k2VGYbd/7FU1s8GW6OBTOih5rfrteLo3FczTfs6X5FkIkUGXZVBv uHt7sn0hBBN/gSfTkspXjE40pg5qIfmZ30NLe0Ktm//NvAzc03YqB8amnI+GfA== 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 D99621FA64; Tue, 5 Apr 2022 04:32:00 +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 2354W0r4005403; Tue, 5 Apr 2022 04:32:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2354W0na005396; Tue, 5 Apr 2022 04:32:00 GMT (envelope-from git) Date: Tue, 5 Apr 2022 04:32:00 GMT Message-Id: <202204050432.2354W0na005396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 97663c8d9e89 - main - get_cachetype_cp15: eliminate write only multilier List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 97663c8d9e898d176d0b36dcd35f30ec1b874d2f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649133121; 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=+g/RxVEsjcRwz2Bm+PaPdkM2y56HgY40Zbo+odkPYtU=; b=qsRgQ1P8sVs1XVcA+lxHBQCV4Q3l31LvOI0ibMqrLSSNYjh8tDb9SXmB6BQPz+EtN2/B4J cocHIuZdG9eHIAACDU7bJJB51I/bSnpbqLLB0PWf2MphB2lQ65ZYvZIVDEGtZFu8w24e70 Tj69OUU4070cASfkRY9GhAUPaasoLBFu7yRPqtPJTdX0pSRGz9HiiB50rvrzIU6yygqTLT sDvl2G0KjDcK8NqKLhsZN8DsjM+lHobwMeEFD5DAreO6SHGFcf+iP3+1dXUcEwtZlRP8j2 nPiRCHd0yOoTHkKSdrWodjWyvhJZ6eM0Kj4e0BJRW6za4kpA5B/CP1HwEwZa+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649133121; a=rsa-sha256; cv=none; b=JLEuWIzmYlFEmtCGro9v0bXk2nOD0DkSe//CZElbi+AYOOd2Af2e/UPIDxxvdvCRkW4Tbs 8LrJcNZVTqxJd1TMH1n7CGkwapgWeeLdP66ANbnppy0/nNg08V8YE9tp4Sp407IZYERFyD fjGAH4CJlcMk8RgsUnlDZ82vfe+imWRRkZRgO+9OdZBoG1Fz5DMHuDGFQy7653KQ5T4CgF uE20yvNacWQ88ewDYSHo0dkp0GErraGnhLRnDt0ec0J9QtkPir9fYFomR06ZuzTsfdNCyC xrbr6r9mnN+CqhaTA7AX5JX4JsYSbJrQu9WAvmLYkFgxp7V+RbfCZQ8E9FfKhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=97663c8d9e898d176d0b36dcd35f30ec1b874d2f commit 97663c8d9e898d176d0b36dcd35f30ec1b874d2f Author: Warner Losh AuthorDate: 2022-04-04 23:53:58 +0000 Commit: Warner Losh CommitDate: 2022-04-05 04:29:06 +0000 get_cachetype_cp15: eliminate write only multilier Sponsored by: Netflix --- 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)