From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Luck, Tony" Subject: [PATCH] ia64: fix build breakage because of conflicting u64 guest handles Date: Wed, 30 Nov 2011 10:22:37 -0800 Message-ID: <4ed6746d25537aefd2@agluck-desktop.sc.intel.com> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============8230622985307717026==" Return-path: List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Annie Li Cc: xen-devel@lists.xensource.com, Ian Campbell , Konrad Rzeszutek Wilk List-Id: xen-devel@lists.xenproject.org --===============8230622985307717026== Content-Type: text/plain 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 --- Can someone either fold this into the above patch, or add it to the same tree that is feeding into linux-next - I saw the breakage in today's "next-20111130" tag. Thanks. arch/ia64/include/asm/xen/interface.h | 2 +- 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); -- 1.7.3.1 --===============8230622985307717026== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --===============8230622985307717026==--