* [PATCH] ia64: fix build breakage because of conflicting u64 guest handles
@ 2011-11-30 18:22 Luck, Tony
2011-11-30 18:39 ` Konrad Rzeszutek Wilk
0 siblings, 1 reply; 4+ messages in thread
From: Luck, Tony @ 2011-11-30 18:22 UTC (permalink / raw)
To: Annie Li; +Cc: xen-devel, Ian Campbell, Konrad Rzeszutek Wilk
[-- Attachment #1: Type: text/plain, Size: 1223 bytes --]
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.
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
[-- Attachment #2: Type: text/plain, Size: 138 bytes --]
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH] ia64: fix build breakage because of conflicting u64 guest handles
2011-11-30 18:22 [PATCH] ia64: fix build breakage because of conflicting u64 guest handles Luck, Tony
@ 2011-11-30 18:39 ` Konrad Rzeszutek Wilk
2011-12-05 9:22 ` ANNIE LI
0 siblings, 1 reply; 4+ messages in thread
From: Konrad Rzeszutek Wilk @ 2011-11-30 18:39 UTC (permalink / raw)
To: Luck, Tony; +Cc: Annie Li, xen-devel, Ian Campbell
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!
>
> 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
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ia64: fix build breakage because of conflicting u64 guest handles
2011-11-30 18:39 ` Konrad Rzeszutek Wilk
@ 2011-12-05 9:22 ` ANNIE LI
2011-12-06 3:27 ` Konrad Rzeszutek Wilk
0 siblings, 1 reply; 4+ messages in thread
From: ANNIE LI @ 2011-12-05 9:22 UTC (permalink / raw)
To: Konrad Rzeszutek Wilk; +Cc: xen-devel, Luck, Tony, Ian Campbell
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?
Thanks
Annie
>> 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
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xensource.com
http://lists.xensource.com/xen-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ia64: fix build breakage because of conflicting u64 guest handles
2011-12-05 9:22 ` ANNIE LI
@ 2011-12-06 3:27 ` Konrad Rzeszutek Wilk
0 siblings, 0 replies; 4+ messages in thread
From: Konrad Rzeszutek Wilk @ 2011-12-06 3:27 UTC (permalink / raw)
To: ANNIE LI; +Cc: xen-devel, Luck, Tony, Ian Campbell
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
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-12-06 3:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-11-30 18:22 [PATCH] ia64: fix build breakage because of conflicting u64 guest handles Luck, Tony
2011-11-30 18:39 ` Konrad Rzeszutek Wilk
2011-12-05 9:22 ` ANNIE LI
2011-12-06 3:27 ` Konrad Rzeszutek Wilk
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.