KekenoBSD/src
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

arm: Only include sysreg.h when needed in asm.h

Browse Source 
We only need sysreg.h for armv6 barriers

Sponsored by:	Arm Ltd
Differential Revision:	https://reviews.freebsd.org/D41141
This commit is contained in:
Andrew Turner
2023-07-24 17:58:16 +01:00
parent 379c736c5a
commit 7a16546025
3 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sys/arm/arm/cpufunc_asm.S
+2
View File
@@ -45,6 +45,8 @@
#include <machine/asm.h> #include <machine/asm.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
#include <machine/sysreg.h>
.text .text
.align 2 .align 2
sys/arm/arm/hypervisor-stub.S
+1
View File
@@ -29,6 +29,7 @@
#include <machine/asm.h> #include <machine/asm.h>
#include <machine/asmacros.h> #include <machine/asmacros.h>
#include <machine/armreg.h> #include <machine/armreg.h>
#include <machine/sysreg.h>
__FBSDID("$FreeBSD$"); __FBSDID("$FreeBSD$");
sys/arm/include/asm.h
+1 -1
View File
@@ -41,7 +41,6 @@
#ifndef _MACHINE_ASM_H_ #ifndef _MACHINE_ASM_H_
#define _MACHINE_ASM_H_ #define _MACHINE_ASM_H_
#include <sys/cdefs.h> #include <sys/cdefs.h>
#include <machine/sysreg.h>
#define _C_LABEL(x) x #define _C_LABEL(x) x
#define _ASM_LABEL(x) x #define _ASM_LABEL(x) x
@@ -194,6 +193,7 @@
#endif #endif
#elif __ARM_ARCH == 6 #elif __ARM_ARCH == 6
#include <machine/sysreg.h>
#define ISB mcr CP15_CP15ISB #define ISB mcr CP15_CP15ISB
#define DSB mcr CP15_CP15DSB #define DSB mcr CP15_CP15DSB
#define DMB mcr CP15_CP15DMB #define DMB mcr CP15_CP15DMB