Re: [PATCH 9/9] xen: arm: remove PSR_MODE_MASK from public interface.

[Stefano Stabellini <stefano.stabellini@eu.citrix.com>]

On Fri, 15 Mar 2013, Ian Campbell wrote:
> 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>


>  xen/arch/arm/arm32/entry.S    |    1 +
>  xen/arch/arm/arm64/entry.S    |    1 +
>  xen/include/asm-arm/regs.h    |    6 ++++++
>  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 3611427..76814dd 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 9d38088..5656f45 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 079c0ca..0130b94 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 3333399..2addf60 100644
> --- a/xen/include/public/arch-arm.h
> +++ b/xen/include/public/arch-arm.h
> @@ -195,9 +195,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
> -- 
> 1.7.2.5
>