From: Luck, Tony Date: Wed, 30 Nov 2011 18:22:37 +0000 (-0800) Subject: xen/ia64: fix build breakage because of conflicting u64 guest handles X-Git-Tag: v2.6.39-400.9.0~595^2~14^2~34 X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=0abae96c631c72153e6528e8d26d26d416eedf67;p=users%2Fjedix%2Flinux-maple.git 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 Signed-off-by: Konrad Rzeszutek Wilk --- diff --git a/arch/ia64/include/asm/xen/interface.h b/arch/ia64/include/asm/xen/interface.h index e951e740bdf2..32ee87e59fbc 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);