Skip to contentSkip to conversation

KVM: IA64: fix struct redefinition

PATCH Applied Xiao Guangrong 2 participants 2 messages Nov 24, 2011 – Nov 27, 2011 KVM

lore
Share & tools
lore

Xiao Guangrong

author
#0 lore raw

PATCH 1/1 KVM: IA64: fix struct redefinition

From: Xiao Guangrong <[email protected]>

There is the same struct definition in ia64 and kvm common code:
arch/ia64/kvm//kvm-ia64.c: At top level:
arch/ia64/kvm//kvm-ia64.c:777:8: error: redefinition of ‘struct kvm_io_range’ include/linux/kvm_host.h:62:8: note: originally defined here

So, rename kvm_io_range to kvm_ia64_io_range in ia64 code

Signed-off-by Xiao Guangrong <[email protected]>
---
 arch/ia64/kvm/kvm-ia64.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)
arch/ia64/kvm/kvm-ia64.c +2 -2
index 92d9f1e..4050520 100644
@@ -774,13 +774,13 @@ struct kvm *kvm_arch_alloc_vm(void)
 	return kvm;
 }
 
-struct kvm_io_range {
+struct kvm_ia64_io_range {
 	unsigned long start;
 	unsigned long size;
 	unsigned long type;
 };
 
-static const struct kvm_io_range io_ranges[] = {
+static const struct kvm_ia64_io_range io_ranges[] = {
 	{VGA_IO_START, VGA_IO_SIZE, GPFN_FRAME_BUFFER},
 	{MMIO_START, MMIO_SIZE, GPFN_LOW_MMIO},
 	{LEGACY_IO_START, LEGACY_IO_SIZE, GPFN_LEGACY_IO},
Signature · 1 line
1.7.7.3
Applied
#1 lore raw
Quoted 9 lines · Xiao Guangrong

From: Xiao Guangrong <[email protected]>

There is the same struct definition in ia64 and kvm common code:
arch/ia64/kvm//kvm-ia64.c: At top level:
arch/ia64/kvm//kvm-ia64.c:777:8: error: redefinition of ‘struct kvm_io_range’ include/linux/kvm_host.h:62:8: note: originally defined here

So, rename kvm_io_range to kvm_ia64_io_range in ia64 code

Thanks, applied.

Signature · 1 line
error compiling committee.c: too many arguments to function