From nobody Fri Jun 13 21:54:50 2025 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 4bJtV22RzTz5MStv; Fri, 13 Jun 2025 21:54:50 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bJtV21MH7z3P45; Fri, 13 Jun 2025 21:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749851690; 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=ttj6LWAPbItBGcV2oDIuRHVzY+u6egK0IISrHDsvS+U=; b=iBTb6+UrfIsiO4fNA4SnWrAHJfU+VxgaZjn2SY4nJZ9tUA3k4UwZS4PVc1RciTU81/ymUh BIApCTGRGsPlDqJFvxhqx9ul0V2SWADeeieZA2N2ycrlmWygVgQGr1tXXb6qYDEmcyrzkh lzyUzbTB7UdNlI07NTzU2qJTmc0GjupGPzQREQLfP2bPBp+/JwzIAroBFUB20WU3LNCirT SeN63H44362N6Wt5bmCB0qBx+KdlkKBWSMCSW+hYl1+0E0+DUJPWcszN6A5mhYTHT+clky pSQ/ktEs8CGbFqTycNjdyxTqe5/w9XDN+CZqgm8Fq82URbzbefw6xv4ow73afA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749851690; 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=ttj6LWAPbItBGcV2oDIuRHVzY+u6egK0IISrHDsvS+U=; b=omY9DWZT5YsDNVQjZDNIbvnhs+neZxaagmrFfrx5qFbmPn4ZBjd5OzX/sgNTg7W6BiU7TQ I4LGtiyIz/PwYsObU0dfb7RML8rRblRZDOZwUvThXVx3b/6MHGt18Y6klN24g6nvJTqSQO 3UUXcxiX5o3C6TXUBQqXIuMkCGoI81l67cyzC4pHH6BerIIHiEvBw3VjLk7qr25FRY/EOv GwZXezwWYC/HcVVmTNisgoJ4Hj3w4ufKgAWmb2KoW/1P+gqhVbqV0v2ifSGKutw2+ygRkW YSp9YfC9FRV778az9bLbYsmoKZT3fffUg5VgAOj7qb/NFAuCFf9ZIdE954BX0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749851690; a=rsa-sha256; cv=none; b=nkc3aUnN7ePRlSQDQpEBpmdSJGLpMCGvQfAFYb0R0Fc0t38BdKVaQWfcoxT3NBVT9wDQn+ U4ly5vvoUOSPftHpNOjPFk+LvtjsJqDxJN0yt+FfSHpvqbSiVHQY5PnN6QCnkUTyPf5csg 6NBxtukagxRcHDO7NxH9GdZjplSXSxLHGZKRZljK+SHkCYclkJQnJpWKbgjXhemFAfX8o5 sgCz9PiJ3lh7bvDtfJ7xpoKPtRKNxiaSowk+yMpMROOCA+L0mxeS/1sz9xuP5hqT2j8vWg MlQYTzShwDN/FGTjJtm8ReFsgVwT3C3MMLTULKrn/ZE1U1Xm+LtCtbNk/zc4CA== 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 4bJtV20sQNz1Dnp; Fri, 13 Jun 2025 21:54:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 55DLso7Y098375; Fri, 13 Jun 2025 21:54:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 55DLso8w098370; Fri, 13 Jun 2025 21:54:50 GMT (envelope-from git) Date: Fri, 13 Jun 2025 21:54:50 GMT Message-Id: <202506132154.55DLso8w098370@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: c82662dc7123 - main - arm pmap: fix CTASSERT 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c82662dc71237660f48b15164b34378cab1da25d Auto-Submitted: auto-generated The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=c82662dc71237660f48b15164b34378cab1da25d commit c82662dc71237660f48b15164b34378cab1da25d Author: Alan Cox AuthorDate: 2025-06-13 21:41:21 +0000 Commit: Alan Cox CommitDate: 2025-06-13 21:53:59 +0000 arm pmap: fix CTASSERT Use the native spelling, PDR_SHIFT, instead of the x86 spelling, PDRSHIFT, that used to be defined by vm_page.h. Fixes: 330b17e1cf5c ("vm: remove pa_index from the machine-independent layer") --- sys/arm/arm/pmap-v6.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index a0e0b007ffaa..a0158bb128e7 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -563,7 +563,7 @@ CTASSERT(PAGE_SIZE == PTE2_SIZE); * so some things, which depend on other ones, are defined independently. * Now, it is time to check that we don't screw up something. */ -CTASSERT(PDRSHIFT == PTE1_SHIFT); +CTASSERT(PDR_SHIFT == PTE1_SHIFT); /* * Check L1 and L2 page table entries definitions consistency. */