Re: [PATCH] ia64: fix build breakage because of conflicting u64 guest handles

[Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>]

On Mon, Dec 05, 2011 at 05:22:31PM +0800, ANNIE LI wrote:
> 
> 
> On 2011-12-1 2:39, Konrad Rzeszutek Wilk wrote:
> >On Wed, Nov 30, 2011 at 10:22:37AM -0800, Luck, Tony wrote:
> >>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>
> >>---
> >>
> >>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.
> >Ah, I can fold it in. Thanks!
> A definition for uint64_t already existing in
> arch/x86/include/asm/xen/interface.h, 58 line:
> DEFINE_GUEST_HANDLE(uint64_t);
> Maybe it is better to remove the definition in
> include/xen/interface/xen.h of grant table v2 patch, and not change
> code of arch/ia64/include/asm/xen/interface.h.
> 
> Konrad, did you fold it already? or I revert the definition in my
> following sub-page and transitive patches?

I took Tony's patch.

_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel