[Xen-devel] arm64: error: PSR_MODE_EL3t redefined

[Olaf Hering <olaf@xxxxxxxxx>]

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)*/
 

_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel