]> www.infradead.org Git - users/jedix/linux-maple.git/commit
xen/ia64: fix build breakage because of conflicting u64 guest handles
authorLuck, Tony <tony.luck@intel.com>
Wed, 30 Nov 2011 18:22:37 +0000 (10:22 -0800)
committerKonrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Thu, 2 Feb 2012 19:06:35 +0000 (14:06 -0500)
commit0abae96c631c72153e6528e8d26d26d416eedf67
tree2bdfd0943cb6534b88a23b9b224bb4ba87709a76
parent18744acd18225662f81299444cddf63ea5ee5411
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>
arch/ia64/include/asm/xen/interface.h