git: 95a5bfcee07c - main - arm64: Use _armreg.h in cpu.h

The branch main has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=95a5bfcee07cf522edab72388decc4d6e27d341d

commit 95a5bfcee07cf522edab72388decc4d6e27d341d
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2025-10-27 10:56:25 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2025-10-27 11:36:17 +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
---
 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 <machine/_armreg.h>
 #include <machine/atomic.h>
 #include <machine/frame.h>
 #endif
-#include <machine/armreg.h>
 
 #define	TRAPF_PC(tfp)		((tfp)->tf_elr)
 #define	TRAPF_USERMODE(tfp)	(((tfp)->tf_spsr & PSR_M_MASK) == PSR_M_EL0t)