From owner-dev-commits-src-main@freebsd.org Tue Sep 21 13:52:37 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 07CD1674124; Tue, 21 Sep 2021 13:52:37 +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 4HDNCm6ldDz4lrG; Tue, 21 Sep 2021 13:52:36 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 C81D225241; Tue, 21 Sep 2021 13:52:36 +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 18LDqaId048375; Tue, 21 Sep 2021 13:52:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 18LDqalq048374; Tue, 21 Sep 2021 13:52:36 GMT (envelope-from git) Date: Tue, 21 Sep 2021 13:52:36 GMT Message-Id: <202109211352.18LDqalq048374@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: 5a619ca07a2d - main - Fix the arm64 L2_BLOCK_MASK definition 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: 5a619ca07a2d6614b7b4ecbb7078d0949702dcd2 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 21 Sep 2021 13:52:37 -0000 The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=5a619ca07a2d6614b7b4ecbb7078d0949702dcd2 commit 5a619ca07a2d6614b7b4ecbb7078d0949702dcd2 Author: Andrew Turner AuthorDate: 2021-09-21 13:46:10 +0000 Commit: Andrew Turner CommitDate: 2021-09-21 13:47:34 +0000 Fix the arm64 L2_BLOCK_MASK definition It was missing the top 16 bits. Sponsored by: The FreeBSD Foundation --- sys/arm64/include/pte.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/include/pte.h b/sys/arm64/include/pte.h index 5d4412d2c141..b3bec720e9f9 100644 --- a/sys/arm64/include/pte.h +++ b/sys/arm64/include/pte.h @@ -125,7 +125,7 @@ typedef uint64_t pt_entry_t; /* page table entry */ #define L2_BLOCK L1_BLOCK #define L2_TABLE L1_TABLE -#define L2_BLOCK_MASK UINT64_C(0xffffffe00000) +#define L2_BLOCK_MASK UINT64_C(0xffffffffffe00000) /* Level 3 table, 4KiB per entry */ #define L3_SHIFT 12