From nobody Mon Apr 04 11:06:09 2022 X-Original-To: dev-commits-src-branches@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 D765A1A97560; Mon, 4 Apr 2022 11:06:10 +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 4KX7Hj4x8Tz3Nfb; Mon, 4 Apr 2022 11:06:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649070369; 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=NoylcDNx1UuYoL3xPfoWHkvybC3p/B3JiQlnEF4aPig=; b=lWwRUcPB/Ix9xF0To61ifUNgZkoyxBTY+LZ8g6bmV658ifY2BetC3XV9kxpG3iIUmrg9wY eOQDi1K+tVNsK/cnCFZ/DQ9nQ1QforoIZCae6ltLyqsCB3Xt2fLJrDidWBT9KMxYQ9Hj0d jSKfK53hb3OzoFLosUk7+6PN9bBu4Q9LheK3I3JOSjxg58k6AfzzGBtLPghKT8jqYue28m XmU1wH1cHb1HiR+o+GTgZ8BRqRh0kWwNVBejfcfPYkqJUV/Zz09iF4IWFuv3FT6Ke2jzhh JDyPOvlZHp9VlONtgCy5iF0bBEhl0rEnk+5zfanGE6LJiKWAy8g+Gv+vf1X2eA== 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 7FDB210ED7; Mon, 4 Apr 2022 11:06:09 +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 234B69Oo086700; Mon, 4 Apr 2022 11:06:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 234B69NO086699; Mon, 4 Apr 2022 11:06:09 GMT (envelope-from git) Date: Mon, 4 Apr 2022 11:06:09 GMT Message-Id: <202204041106.234B69NO086699@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 5abab0f952ba - stable/13 - Remove a redundant L1_BLOCK == L2_BLOCK check List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5abab0f952ba98fb68cacc0d3f6cdafddf9ba629 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1649070369; 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=NoylcDNx1UuYoL3xPfoWHkvybC3p/B3JiQlnEF4aPig=; b=V4Thwcuu4/V68iZf5Uh3+mmIHUXB1Q64L0vdMEtdueIzgI20/oaVWfWHHJB1Vt3ex1/3+w EGGGg9vuHx9FxYJmpqyKcut1DD/6kOARzrG+ksLk27bN+K7oLMrP6xFA9yOHcAwcF368/2 ZwBSHIlziKMIhjDzv0DBZqLVvL8LUvZpK3sKEPZvaY490Na1ZDm7/TmseCDFOX3oYl/tup QTh7WNL2lqIxosGXWVKst0TGyPlv3so9y2s/5FD0fkIdGtkv1THtpIrAvQrmXPy4NwYoBf LP/KT2QCiD/Io75L53y7PP/CQj/RHGxbLu6r7iFr1GJeSJ5NHJibbG0uuedr1Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649070369; a=rsa-sha256; cv=none; b=rdcXYriTqYqY5pU496QZPFkglmA7Ju3UkHu6x6ezjP4/ZvcZIcR9MKDteo3AmBHNQFv4LV zwx+RBrcd+M8orutn0CsUDzzZhklSAFcXVD+NL3E7j29Ve4qweMgB/6AIXJ5tWSHZfK9ET 4QKeEPhXkWixtlX+hBYVtXiBvb2AVUYTBK56/pEt8yxd+0pHXVBlloHuJxrnQt8KhfS7Zt 3jyTYNLxRVRWWsQVOwYe8qn8qMG/gxwzMPWAYM1uK18zPypmIHYjDp336lFFZZcxXIzrUP dgX6NFRL5qrOpJal+RJo9t2GiIE2DMHVb6IHGqXApMh/DpzKa3ac2xyDIyA1Og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5abab0f952ba98fb68cacc0d3f6cdafddf9ba629 commit 5abab0f952ba98fb68cacc0d3f6cdafddf9ba629 Author: Andrew Turner AuthorDate: 2022-03-15 14:02:38 +0000 Commit: Andrew Turner CommitDate: 2022-04-04 09:37:07 +0000 Remove a redundant L1_BLOCK == L2_BLOCK check We have two checks for L1_BLOCK == L2_BLOCK. Remove one. Sponsored by: The FreeBSD Foundation (cherry picked from commit 51f5cafcdc47357596cac8c6166331beb264df39) --- sys/arm64/arm64/pmap.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 924b82f01313..95587b84f403 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1306,7 +1306,6 @@ pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) KASSERT(lvl > 0 && lvl <= 3, ("pmap_extract_and_hold: Invalid level %d", lvl)); - CTASSERT(L1_BLOCK == L2_BLOCK); KASSERT((lvl == 3 && (tpte & ATTR_DESCR_MASK) == L3_PAGE) || (lvl < 3 && (tpte & ATTR_DESCR_MASK) == L1_BLOCK), ("pmap_extract_and_hold: Invalid pte at L%d: %lx", lvl,