ia64: fix build breakage because of conflicting u64 guest handles

PATCH In review Luck, Tony 3 participants 4 messages Nov 30, 2011 – Dec 6, 2011

Share & tools

Luck, Tony

author

2011-11-30 18:22 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

---

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(-)

arch/ia64/include/asm/xen/interface.h +1 -1

index 1d2427d..fbb5198 100644
@@ -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);

Signature · 1 line

1.7.3.1

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

Konrad Rzeszutek Wilk

2011-11-30 18:39 UTC #1 lore raw

Quoted 7 lines · Tony

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".

Quoted 8 lines

Fix: delete the ia64 arch specific definition.
Signed-off-by Tony Luck <[email protected]>
---
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!

Quoted 19 lines

 arch/ia64/include/asm/xen/interface.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

arch/ia64/include/asm/xen/interface.h +1 -1

index 1d2427d..fbb5198 100644
@@ -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);

Signature · 1 line

1.7.3.1

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

ANNIE LI

2011-12-05 09:22 UTC #2 lore raw

Quoted 10 lines · Konrad Rzeszutek Wilk

Quoted 9 lines · Tony
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.

Quoted 7 lines

Quoted 6 lines
Signed-off-by Tony Luck<[email protected]>
---
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

Quoted 18 lines

  arch/ia64/include/asm/xen/interface.h |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

arch/ia64/include/asm/xen/interface.h +1 -1

index 1d2427d..fbb5198 100644
@@ -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);

Signature · 1 line

1.7.3.1

_______________________________________________
Xen-devel mailing list
[email protected]
http://lists.xensource.com/xen-devel

Konrad Rzeszutek Wilk

2011-12-06 03:27 UTC #3 lore raw

Quoted 27 lines · ANNIE LI

Quoted 10 lines · Konrad Rzeszutek Wilk
Quoted 9 lines · Tony
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.
Quoted 7 lines
Quoted 6 lines
Signed-off-by Tony Luck<[email protected]>
---
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.

Quoted 2 lines

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
[email protected]
http://lists.xensource.com/xen-devel