From: Ian Campbell <ian.campbell@citrix.com>
To: xen-devel@lists.xen.org
Cc: stefano.stabellini@citrix.com, tim@xen.org,
Ian Campbell <ian.campbell@citrix.com>,
ian.jackson@citrix.com
Subject: [PATCH 9/9] xen: arm: remove PSR_MODE_MASK from public interface.
Date: Fri, 15 Mar 2013 13:15:50 +0000 [thread overview]
Message-ID: <1363353350-32251-9-git-send-email-ian.campbell@citrix.com> (raw)
In-Reply-To: <1363353334.520.7.camel@zakaz.uk.xensource.com>
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>
---
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
next prev parent reply other threads:[~2013-03-15 13:15 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-15 13:15 [PATCH 00/09] arm: tools: build for arm64 and enable cross-compiling for both arm32 and arm64 Ian Campbell
2013-03-15 13:15 ` [PATCH 1/9] tools: Use AC_SYS_LARGEFILE instead of calling getconf(1) Ian Campbell
2013-03-15 15:35 ` Ian Jackson
2013-03-15 13:15 ` [PATCH 2/9] blktap2: use sys/eventfd.h if it is available Ian Campbell
2013-03-15 15:24 ` Ian Jackson
2013-03-15 13:15 ` [PATCH 3/9] tools: only build blktap1 on x86 Ian Campbell
2013-03-15 15:24 ` Ian Jackson
2013-03-15 13:15 ` [PATCH 4/9] tools: only check for Python devel tools if not cross-compiling Ian Campbell
2013-03-15 15:27 ` Ian Jackson
2013-03-15 13:15 ` [PATCH 5/9] tools: libxc: arm64 support Ian Campbell
2013-03-15 15:26 ` Ian Jackson
2013-03-15 16:31 ` Tim Deegan
2013-03-15 13:15 ` [PATCH 6/9] tools: memshr: " Ian Campbell
2013-03-15 15:29 ` Ian Jackson
2013-03-19 15:52 ` Stefano Stabellini
2013-03-15 13:15 ` [PATCH 7/9] xenctx: Support arm64 Ian Campbell
2013-03-15 15:30 ` Ian Jackson
2013-03-15 15:43 ` Ian Campbell
2013-03-15 13:15 ` [PATCH 8/9] xen: arm64 uses the same I/O ABI as arm32 Ian Campbell
2013-03-19 15:48 ` Stefano Stabellini
2013-03-15 13:15 ` Ian Campbell [this message]
2013-03-19 15:49 ` [PATCH 9/9] xen: arm: remove PSR_MODE_MASK from public interface Stefano Stabellini
2013-04-11 10:09 ` [PATCH 00/09] arm: tools: build for arm64 and enable cross-compiling for both arm32 and arm64 Ian Campbell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1363353350-32251-9-git-send-email-ian.campbell@citrix.com \
--to=ian.campbell@citrix.com \
--cc=ian.jackson@citrix.com \
--cc=stefano.stabellini@citrix.com \
--cc=tim@xen.org \
--cc=xen-devel@lists.xen.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).