diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2013-03-15 13:15:50 +0000 |
|---|---|---|
| committer | Ian Campbell <ian.campbell@citrix.com> | 2013-04-11 11:09:26 +0100 |
| commit | e8dec6c69a6d0cbf19d120b9ecc03bc637fe23e4 (patch) | |
| tree | 5426bb32e6c188abd166a9f8ee3a325a66064280 | |
| parent | 0793e96282f0e81c333edfb8ae8e42801b2f3385 (diff) | |
| download | xen-e8dec6c69a6d0cbf19d120b9ecc03bc637fe23e4.tar.gz xen-e8dec6c69a6d0cbf19d120b9ecc03bc637fe23e4.tar.bz2 xen-e8dec6c69a6d0cbf19d120b9ecc03bc637fe23e4.zip | |
xen: arm: remove PSR_MODE_MASK from public interface.
This is also defined in sys/ptrace.h on arm64 which breaks the tools build due
to multiple definitions. I expect this is really a bug in the kernel and/or
glibc but we don't really need this symbol in the public headers, at least not
right now, so move it into include/asm instead.
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Stefano Stabellini <stefano.stabellini@eu.citrix.com>
| -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 |