From nobody Tue Jan 13 16:27:35 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 4drF5g5NXqz6NMx4 for ; Tue, 13 Jan 2026 16:27:35 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4drF5g35sZz3Ksq for ; Tue, 13 Jan 2026 16:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768321655; 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=nTZ/oJK5npKO3nF4i4TQyfwQEZQslNIxTPVEea7WmFs=; b=QfeeGVgE1WG571QD5hszbH1tgb2ifUH11u4AVF6sFKDqll9Y2iikbb9wH1QkxcI4QwXpMf m0jKjYrFjkZ9E7qQsE5/qJrD391fSwAbWEXruJjIAowafnIl0/fw/G8nPbBvsjKtTCZeja qnS/HP7ZjXDtmZLIOjXQCJkIBAfKgnXTGFAegYg8rIav24n/KVToFBd7GTUUv03di0LxDP nOuU8+LQJ+3VFjRce2bt/Rv7DpZ6PH+pfMYZxmsNaT2IrcLB+VW9VZBfSCTHyCBseIGlnC Li2WfY3c2x2d6gJMIs9Kbvl20E7q1zCZs2zWgfp9p1S7oTA7XOc50KoyQK2Bww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1768321655; 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=nTZ/oJK5npKO3nF4i4TQyfwQEZQslNIxTPVEea7WmFs=; b=mkV0HjPyJxmofAgi4CKiYiCXgPNm29I0lowZceMzFBRLsTu7IHGbb8rsCzgJ8jouQZyNw9 iiLzpNUqjDu1zRz5Wxl3WlqitRGGm+xsmF9ACtYzYT3dymZtynJRhIrm/OxHnaDMGLxz78 jRqrLFsfX+WkdVweagODKemw6GwWZXQrtUUvwJm3+cA6dHkyALKu6MeAgyuKqlb0VHinmN yzJbPGIzYAHE9TeRoAUBxsW5N0hKqXkJByhDPsVScGZ2u9ic+cXNl1IPTSY4zE+1c2Hjds OPAIEsp0IZdF6CM19qrLRhkQwh3EvayPkNOyCLPacmvDV2zZiKPzpxl6dWBlgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1768321655; a=rsa-sha256; cv=none; b=eE25SeTUKHStGbe3wBF+uEt2xGCkWP3+PBjaycIX6ZoftbdL+zqQrl+1pPD0S9LrLhLTQm VwT8xJJ1HXTNbG/4lvZi8ZLqQFRbCGMFPvxOV1EBcEUUHh9+GaeELbBlNpxRbU/ISaNMAb E3xn8s/kzOWITTb9SO4ajYS8UZVv3oVRM3nDjdpKcbMkZEEAh60no0A31L7XodS7fC0702 tMgAe01obtu9VT8mJacZVs+lIh2FJUcjBAifC5ewkcny6fwOkXZ6QFQFOnfPO8I2SfXE6f zHNoNHAps8b2g7lyq2n9wZy2KpFq078Pp5u+lj6UTa3nFNSSYqdeHn7Fd5XHnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4drF5g2Kxqz4cj for ; Tue, 13 Jan 2026 16:27:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30396 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 13 Jan 2026 16:27:35 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 28bb4a9838c9 - stable/15 - arm64: Use _armreg.h in cpu.h 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 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/15 X-Git-Reftype: branch X-Git-Commit: 28bb4a9838c990be24a92e3dab9d5e6b3febf39a Auto-Submitted: auto-generated Date: Tue, 13 Jan 2026 16:27:35 +0000 Message-Id: <69667277.30396.1fba02cd@gitrepo.freebsd.org> The branch stable/15 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=28bb4a9838c990be24a92e3dab9d5e6b3febf39a commit 28bb4a9838c990be24a92e3dab9d5e6b3febf39a Author: Andrew Turner AuthorDate: 2025-10-27 10:56:25 +0000 Commit: Andrew Turner CommitDate: 2026-01-13 14:06:20 +0000 arm64: Use _armreg.h in cpu.h We only needed armreg.h for the *_SPECIALREG macros. Use the new _armreg.h directly. Reviewed by: emaste Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D53325 (cherry picked from commit 95a5bfcee07cf522edab72388decc4d6e27d341d) --- sys/arm64/include/_armreg.h | 1 + sys/arm64/include/cpu.h | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm64/include/_armreg.h b/sys/arm64/include/_armreg.h index 7aa3c358b327..0f5134e5a978 100644 --- a/sys/arm64/include/_armreg.h +++ b/sys/arm64/include/_armreg.h @@ -28,6 +28,7 @@ */ #if !defined(_MACHINE_ARMREG_H_) && \ + !defined(_MACHINE_CPU_H_) && \ !defined(_MACHINE_HYPERVISOR_H_) #error Do not include this file directly #endif diff --git a/sys/arm64/include/cpu.h b/sys/arm64/include/cpu.h index 124da8c215ed..b15210633d37 100644 --- a/sys/arm64/include/cpu.h +++ b/sys/arm64/include/cpu.h @@ -43,10 +43,10 @@ #define _MACHINE_CPU_H_ #if !defined(__ASSEMBLER__) +#include #include #include #endif -#include #define TRAPF_PC(tfp) ((tfp)->tf_elr) #define TRAPF_USERMODE(tfp) (((tfp)->tf_spsr & PSR_M_MASK) == PSR_M_EL0t)