@@ -3,6 +3,8 @@
#include <xen/stringify.h>
+#include <asm/arm64/sysregs.h>
+
#ifndef __ASSEMBLY__
/* Anonymous union includes both 32- and 64-bit names (e.g., r0/x0). */
similarity index 98%
rename from xen/include/asm-arm/sysregs.h
rename to xen/include/asm-arm/arm64/sysregs.h
@@ -1,7 +1,5 @@
-#ifndef __ASM_ARM_SYSREGS_H
-#define __ASM_ARM_SYSREGS_H
-
-#ifdef CONFIG_ARM_64
+#ifndef __ASM_ARM_ARM64_SYSREGS_H
+#define __ASM_ARM_ARM64_SYSREGS_H
#include <xen/stringify.h>
@@ -168,9 +166,7 @@
#define ICH_AP1R2_EL2 __AP1Rx_EL2(2)
#define ICH_AP1R3_EL2 __AP1Rx_EL2(3)
-#endif
-
-#endif
+#endif /* _ASM_ARM_ARM64_SYSREGS_H */
/*
* Local variables:
@@ -2,7 +2,6 @@
#define __ASM_ARM_PROCESSOR_H
#include <asm/cpregs.h>
-#include <asm/sysregs.h>
#ifndef __ASSEMBLY__
#include <xen/types.h>
#endif
sysregs.h contains only code protected by #ifdef CONFIG_ARM_64. Move it in arm64 sub-directory to reflect that and remove the #ifdef. At the same time, fixup the guards. Signed-off-by: Julien Grall <julien.grall@arm.com> --- xen/include/asm-arm/arm64/processor.h | 2 ++ xen/include/asm-arm/{ => arm64}/sysregs.h | 10 +++------- xen/include/asm-arm/processor.h | 1 - 3 files changed, 5 insertions(+), 8 deletions(-) rename xen/include/asm-arm/{ => arm64}/sysregs.h (98%)