From nobody Thu Aug 6 15:01:41 2026 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 4hG9Ty14f8z6nBRB for ; Thu, 06 Aug 2026 15:01:42 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hG9Tx2q2Nz3Dm6 for ; Thu, 06 Aug 2026 15:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786028501; 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=VWSng8z5kQqfyHZKsff5tsmw8aFHZmv61GrSEtRhnOE=; b=o9blTYhRbuKy2yep8itaermY41HQx+lzroJavC2r3e792mMLxc3pDvPSK4cdAR1utu931N ZXf3G5iYVGm1qK648zO0xMsBxaQl0wHk27U7XeXqzvSxa9KvayHhj+WDR6bSLMLzgz2Ch5 qtFb5hUlwfGa3xVIQtZKmBTjFksqNQiISuMtejHsKMuAfSVnjLQt7TCC5/Zq/h9cJDJSUA BsV+zb0pWWBkpLo+4yaU16gIF3B7HNoWFbUzqV5gTlsw5GN4Q9OrDrp0drP9i3cVln/nyv S2Ih7mPuVJevsAAulf+GIK3dVExJSvzPwQyTSKeBgJmSSLYj3H5H+5rmW/yP1g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1786028501; a=rsa-sha256; cv=none; b=sb1DhGcO89W4XMASTUHfdkoauchIiryH0Mp3dsYQNrltUQ3Mm80xIV7piWCRGqiTYm5w8Y 4a4E+5/SpJztI54qD5ubFvUbjs3s7HKD5jx2vxOi9MF7KLR30k9cX0KiyY64OaKJwd0gWX 6n5Z1Uk2DF+1MqCJwC5lci68QHM4RazvuY0D519nRZ7yH+37QE3qm3QAVeRjDhX+XpuB/8 EmlRSpSK126ElTn8+48tg4T6PZtBXrMiXYagDDgqqtceBc311PWouJqd6gJ+Bxh6wEM/b3 DGEckI6+B0uUAkhiSHiJRPwOSHiJb+08tjQUi/nVhQuL6zfyIGqNjQqkhFt+Ew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1786028501; 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=VWSng8z5kQqfyHZKsff5tsmw8aFHZmv61GrSEtRhnOE=; b=c2mspnHzRxAtpq58iGVyN5mnoSdtAKI7DxMaRWMPfOqZvdaAsmtvYG0QWtpqVRwRBjLhH4 MKHQMEbZ7gNghnMy0UiW7aBVxvDGP178U3zC6j59i9Qu5KlVx9mRYkkK0pXVNeZO/U1gQ9 mhEyJyZykczNi8J+qrVflUZX3uXLD7H6Lx2xzbg3KxVynfFtkbiwC5DJbZPnPMVJFobQmQ 7dy6EtrKENrOfRdcG6PmrX5oNg0xGjAY+qbWzqsZdlJxpMNIxdywkCW7140j44jj7v5Dfh y+GRXndskj3Z6skZiLTpdOevTgzY0qBe3VlKEDf9757kgO1ItWF9T/UoF/IeDw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hG9Tx1D8jz8gq for ; Thu, 06 Aug 2026 15:01:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 46259 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 06 Aug 2026 15:01:41 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 9cc432da231b - stable/15 - arm64: Fix the build 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 9cc432da231b6fd977954df806dd0e003cbbe088 Auto-Submitted: auto-generated Date: Thu, 06 Aug 2026 15:01:41 +0000 Message-Id: <6a74a1d5.46259.4eb69a4@gitrepo.freebsd.org> The branch stable/15 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=9cc432da231b6fd977954df806dd0e003cbbe088 commit 9cc432da231b6fd977954df806dd0e003cbbe088 Author: Mark Johnston AuthorDate: 2026-07-19 02:33:08 +0000 Commit: Mark Johnston CommitDate: 2026-08-06 13:24:43 +0000 arm64: Fix the build Fixes: a7e483ee146a ("vm_phys: Add a sysctl to dump registered fictitious memory ranges") (cherry picked from commit 91b419bc7e15f2138cb211c4d7c5be118c377c20) --- sys/arm64/include/vm.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/arm64/include/vm.h b/sys/arm64/include/vm.h index e8c8f52fda0a..5ceaa9622aec 100644 --- a/sys/arm64/include/vm.h +++ b/sys/arm64/include/vm.h @@ -44,6 +44,7 @@ /* If defined vmstat will try to use both of these in a switch statement */ #define VM_MEMATTR_WRITE_COMBINING VM_MEMATTR_WRITE_THROUGH +#ifndef LOCORE static inline const char * vm_memattr_name(vm_memattr_t memattr) { @@ -65,5 +66,6 @@ vm_memattr_name(vm_memattr_t memattr) } } #endif +#endif #endif /* !_MACHINE_VM_H_ */