summaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
authorLuck, Tony <tony.luck@intel.com>2011-11-30 10:22:37 -0800
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>2011-11-30 13:40:03 -0500
commit4313d88c93df8c096adde516b08f1fb2f2e8b844 (patch)
tree1028deebd426c4046d41d41fcece85ee3e8b20c1 /arch/ia64
parentc123799a41bf466ce5b199331aac4c1f28f67ec3 (diff)
downloadop-kernel-dev-4313d88c93df8c096adde516b08f1fb2f2e8b844.zip
op-kernel-dev-4313d88c93df8c096adde516b08f1fb2f2e8b844.tar.gz
xen/ia64: fix build breakage because of conflicting u64 guest handles
include/xen/interface/xen.h:526: error: conflicting types for ‘__guest_handle_u64’ arch/ia64/include/asm/xen/interface.h:74: error: previous declaration of ‘__guest_handle_u64’ was here Problem introduced by "xen/granttable: Introducing grant table V2 stucture" which added a new definition to include/xen/interface/xen.h for "u64". Fix: delete the ia64 arch specific definition. Signed-off-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/include/asm/xen/interface.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/ia64/include/asm/xen/interface.h b/arch/ia64/include/asm/xen/interface.h
index 1d2427d..fbb5198 100644
--- a/arch/ia64/include/asm/xen/interface.h
+++ b/arch/ia64/include/asm/xen/interface.h
@@ -71,7 +71,7 @@
__DEFINE_GUEST_HANDLE(uchar, unsigned char);
__DEFINE_GUEST_HANDLE(uint, unsigned int);
__DEFINE_GUEST_HANDLE(ulong, unsigned long);
-__DEFINE_GUEST_HANDLE(u64, unsigned long);
+
DEFINE_GUEST_HANDLE(char);
DEFINE_GUEST_HANDLE(int);
DEFINE_GUEST_HANDLE(long);
OpenPOWER on IntegriCloud