From nobody Tue Mar 15 17:29:19 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 7F2AE1A170BD; Tue, 15 Mar 2022 17:29:19 +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 4KJ0l32yQFz50GG; Tue, 15 Mar 2022 17:29:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647365359; 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=KjStT2ttnHXJbgjK57TYQ6kOM0TlUXzqkXRKkoYLgbQ=; b=HtzoKm+1FBVkjNhD8HE7oJx3ryTIra+1JkS16lw2b6DCMV9vwWAbRxGLLtSfcj5nxi0opc Isiz8A9Z+Jk1lJNMSZbWdVNYeoonVRAx7T279F+iv2fuD0PIfk93MuIZlx9IWKbjjOGP/l kDABzrCg1jSAKLqhLd5nSFFkkdDzXpZEwOzKt5LsuTwNLzq4eaNLW/fytboNFdb2DZDtvT pO0HjA/odQWUKE7xvo/odj+LuEOGtv2djChBz4MdGJgfBF9qcDt1167DQiqsHgTrNE3aat aOmmZ1TAxc0QWUe3x+3KnAXl3JNaGrWxvFUGOpMCWd003TV4l5SFFx+pudsYcw== 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 41DE925962; Tue, 15 Mar 2022 17:29:19 +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 22FHTJdU006496; Tue, 15 Mar 2022 17:29:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FHTJqq006495; Tue, 15 Mar 2022 17:29:19 GMT (envelope-from git) Date: Tue, 15 Mar 2022 17:29:19 GMT Message-Id: <202203151729.22FHTJqq006495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 51f5cafcdc47 - main - Remove a redundant L1_BLOCK == L2_BLOCK check 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51f5cafcdc47357596cac8c6166331beb264df39 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647365359; 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=KjStT2ttnHXJbgjK57TYQ6kOM0TlUXzqkXRKkoYLgbQ=; b=vu10gv83EzetIUGcJbzO7CfY3p7i9+t0jtJd+ycsjTMBZU3NYeRkaq4aK+sZXKSDDnXk4Q wQcqErafmXAZtOWFOrx40jDrP1oysw3l70EVvYqt0h6loOlomCkdREHOOKpI8VapXqOXZ4 TS5sY8Iy9OqM//CF3kpqiwKb0WyIWeCSKPvXuwX2PnKF3T2e7nH5Esjq10p/t2psFkPQaL RfBjL1aZbqoQtjYq7HcAUzvZnZCM4WrRmfblSu4+Q6B6uj6cNrdcwkVzVEzXPSEKsoPW6r ymOxfs3ibdVlDUrAeefe8ztrejfhQtz6KwIjaUVZ1PG0mQ0ckwexAJCAFOxNmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647365359; a=rsa-sha256; cv=none; b=x68tjY9AuTeUfyhPUQfZsB4yiT9GfqN1DTs+VZmfqJdUC4esGmEf2+M8kvfJqsQkm3ul+i WvGRAT6h3w8h3A0oYEInJBMtcUBx2VfZ3QM4SA05H6Kdt0rQ0D9niYeCumRPOl8TeU3CD0 SkqzCPRn8gkMzsiiSW6mk/zU8QGFAyMYNuLabeiRy3dvTkrP0HGD2sBj0zF9HER0LW+BhK FBUHScMd41RqR/ElQ+hg7hmQqaJ2ZERLaIZkKWBvcSSjeNGWBcMFWgbdhTIBZ87uIxTVoI hvUdLvx37WBvnZ5vICAncLU9ckuDNnvGZASiL0HS5NaKl5h9FJuDgl+5sw1PdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=51f5cafcdc47357596cac8c6166331beb264df39 commit 51f5cafcdc47357596cac8c6166331beb264df39 Author: Andrew Turner AuthorDate: 2022-03-15 14:02:38 +0000 Commit: Andrew Turner CommitDate: 2022-03-15 17:25:28 +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 --- 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 1570bf3d0b9c..12b3bed7cb72 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -1382,7 +1382,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,