From mboxrd@z Thu Jan  1 00:00:00 1970
From: Olaf Hering <olaf@aepfle.de>
Subject: arm64: error: PSR_MODE_EL3t redefined
Date: Sat, 1 Feb 2014 17:15:13 +0100
Message-ID: <20140201161513.GA13789@aepfle.de>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org


I'm  seeing build failures on aarch64 during 'make tools' because both
arch/arm64/include/uapi/asm/ptrace.h from the kernel source and
xen/include/public/arch-arm.h from xen-4.4 define PSR_MODE_EL3t with
sightly different strings.

I think the if defined (__XEN_TOOLS__) should be removed from
xen/include/public/arch-arm.h so that userland tools can pickup the
defines from /usr/include. Untested patch below.

Olaf

diff --git a/xen/include/public/arch-arm.h b/xen/include/public/arch-arm.h
index 7496556..17422e6 100644
--- a/xen/include/public/arch-arm.h
+++ b/xen/include/public/arch-arm.h
@@ -316,7 +316,7 @@ typedef uint64_t xen_callback_t;
 
 #endif
 
-#if defined(__XEN__) || defined(__XEN_TOOLS__)
+#if defined(__XEN__)
 
 /* PSR bits (CPSR, SPSR)*/