[Xen-changelog] [xen master] xen: arm: remove PSR_MODE_MASK from public interface.

[patchbot@xxxxxxx]

commit e8dec6c69a6d0cbf19d120b9ecc03bc637fe23e4
Author:     Ian Campbell <ian.campbell@xxxxxxxxxx>
AuthorDate: Fri Mar 15 13:15:50 2013 +0000
Commit:     Ian Campbell <ian.campbell@xxxxxxxxxx>
CommitDate: Thu Apr 11 11:09:26 2013 +0100

    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@xxxxxxxxxx>
    Acked-by: Stefano Stabellini <stefano.stabellini@xxxxxxxxxxxxx>
---
 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 e44e90f..746df8e 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
--
generated by git-patchbot for /home/xen/git/xen.git#master

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog