diff options
-rw-r--r-- | xen/arch/arm/arm32/entry.S | 1 | ||||
-rw-r--r-- | xen/arch/arm/arm64/entry.S | 1 | ||||
-rw-r--r-- | xen/include/asm-arm/regs.h | 6 | ||||
-rw-r--r-- | xen/include/public/arch-arm.h | 3 |
4 files changed, 8 insertions, 3 deletions
diff --git a/xen/arch/arm/arm32/entry.S b/xen/arch/arm/arm32/entry.S index 36114273d7..76814dd5eb 100644 --- a/xen/arch/arm/arm32/entry.S +++ b/xen/arch/arm/arm32/entry.S @@ -1,5 +1,6 @@ #include <xen/config.h> #include <asm/asm_defns.h> +#include <asm/regs.h> #include <public/xen.h> #define SAVE_ONE_BANKED(reg) mrs r11, reg; str r11, [sp, #UREGS_##reg] diff --git a/xen/arch/arm/arm64/entry.S b/xen/arch/arm/arm64/entry.S index 9d38088c85..5656f4565b 100644 --- a/xen/arch/arm/arm64/entry.S +++ b/xen/arch/arm/arm64/entry.S @@ -1,5 +1,6 @@ #include <xen/config.h> #include <asm/asm_defns.h> +#include <asm/regs.h> #include <public/xen.h> /* diff --git a/xen/include/asm-arm/regs.h b/xen/include/asm-arm/regs.h index 079c0ca47b..0130b94e75 100644 --- a/xen/include/asm-arm/regs.h +++ b/xen/include/asm-arm/regs.h @@ -1,6 +1,10 @@ #ifndef __ARM_REGS_H__ #define __ARM_REGS_H__ +#define PSR_MODE_MASK 0x1f + +#ifndef __ASSEMBLY__ + #include <xen/types.h> #include <public/xen.h> #include <asm/processor.h> @@ -42,6 +46,8 @@ */ extern register_t *select_user_reg(struct cpu_user_regs *regs, int reg); +#endif + #endif /* __ARM_REGS_H__ */ /* * Local variables: diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h index e44e90f7bc..746df8e69f 100644 --- a/xen/include/public/arch-arm.h +++ b/xen/include/public/arch-arm.h @@ -206,9 +206,6 @@ typedef uint64_t xen_callback_t; /* PSR bits (CPSR, SPSR)*/ -/* 0-4: Mode */ -#define PSR_MODE_MASK 0x1f - /* 32 bit modes */ #define PSR_MODE_USR 0x10 #define PSR_MODE_FIQ 0x11 |