Commit 4313d88c authored Nov 30, 2011 by Luck, Tony Committed by Konrad Rzeszutek Wilk Nov 30, 2011

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>

parent c123799a

arch/ia64/include/asm/xen/interface.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -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);

Admin message