diff options
| author | Andrew Turner <andrew@FreeBSD.org> | 2023-07-24 16:58:16 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2023-07-24 16:58:16 +0000 |
| commit | 7a165460252c04cbdfb60e3e86b788dcf4b72e9a (patch) | |
| tree | df0318b9fe8b1c503bfa3e232416ac57c1a5e692 | |
| parent | 379c736c5a0688c564cf733b70a15da385aa6439 (diff) | |
| download | src-7a165460252c04cbdfb60e3e86b788dcf4b72e9a.tar.gz src-7a165460252c04cbdfb60e3e86b788dcf4b72e9a.zip | |
arm: Only include sysreg.h when needed in asm.h
We only need sysreg.h for armv6 barriers
Sponsored by: Arm Ltd
Differential Revision: https://reviews.freebsd.org/D41141
| -rw-r--r-- | sys/arm/arm/cpufunc_asm.S | 2 | ||||
| -rw-r--r-- | sys/arm/arm/hypervisor-stub.S | 1 | ||||
| -rw-r--r-- | sys/arm/include/asm.h | 2 |
3 files changed, 4 insertions, 1 deletions
diff --git a/sys/arm/arm/cpufunc_asm.S b/sys/arm/arm/cpufunc_asm.S index 94b34714bfe4..3f4d415b56d8 100644 --- a/sys/arm/arm/cpufunc_asm.S +++ b/sys/arm/arm/cpufunc_asm.S @@ -45,6 +45,8 @@ #include <machine/asm.h> __FBSDID("$FreeBSD$"); +#include <machine/sysreg.h> + .text .align 2 diff --git a/sys/arm/arm/hypervisor-stub.S b/sys/arm/arm/hypervisor-stub.S index e7268e6465c4..2202edf6b4c2 100644 --- a/sys/arm/arm/hypervisor-stub.S +++ b/sys/arm/arm/hypervisor-stub.S @@ -29,6 +29,7 @@ #include <machine/asm.h> #include <machine/asmacros.h> #include <machine/armreg.h> +#include <machine/sysreg.h> __FBSDID("$FreeBSD$"); diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h index 72bf244c449a..e2e71e13b643 100644 --- a/sys/arm/include/asm.h +++ b/sys/arm/include/asm.h @@ -41,7 +41,6 @@ #ifndef _MACHINE_ASM_H_ #define _MACHINE_ASM_H_ #include <sys/cdefs.h> -#include <machine/sysreg.h> #define _C_LABEL(x) x #define _ASM_LABEL(x) x @@ -194,6 +193,7 @@ #endif #elif __ARM_ARCH == 6 +#include <machine/sysreg.h> #define ISB mcr CP15_CP15ISB #define DSB mcr CP15_CP15DSB #define DMB mcr CP15_CP15DMB |