diff options
author | Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> | 2011-11-24 05:09:11 -0500 |
---|---|---|
committer | Avi Kivity <avi@redhat.com> | 2011-12-27 04:17:43 -0500 |
commit | 60f9a9ef5492cae66aca2ad9873360161320d5af (patch) | |
tree | 9fc03198a5aad6491e39fa2410f0a82648f75688 /arch/ia64/kvm/kvm-ia64.c | |
parent | f85e2cb5dbaf905e9470d3fe099b31619da431fc (diff) |
KVM: IA64: fix struct redefinition
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 <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: Avi Kivity <avi@redhat.com>
Diffstat (limited to 'arch/ia64/kvm/kvm-ia64.c')
-rw-r--r-- | arch/ia64/kvm/kvm-ia64.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/ia64/kvm/kvm-ia64.c b/arch/ia64/kvm/kvm-ia64.c index 92d9f1e4740f..405052002493 100644 --- a/arch/ia64/kvm/kvm-ia64.c +++ b/arch/ia64/kvm/kvm-ia64.c | |||
@@ -774,13 +774,13 @@ struct kvm *kvm_arch_alloc_vm(void) | |||
774 | return kvm; | 774 | return kvm; |
775 | } | 775 | } |
776 | 776 | ||
777 | struct kvm_io_range { | 777 | struct kvm_ia64_io_range { |
778 | unsigned long start; | 778 | unsigned long start; |
779 | unsigned long size; | 779 | unsigned long size; |
780 | unsigned long type; | 780 | unsigned long type; |
781 | }; | 781 | }; |
782 | 782 | ||
783 | static const struct kvm_io_range io_ranges[] = { | 783 | static const struct kvm_ia64_io_range io_ranges[] = { |
784 | {VGA_IO_START, VGA_IO_SIZE, GPFN_FRAME_BUFFER}, | 784 | {VGA_IO_START, VGA_IO_SIZE, GPFN_FRAME_BUFFER}, |
785 | {MMIO_START, MMIO_SIZE, GPFN_LOW_MMIO}, | 785 | {MMIO_START, MMIO_SIZE, GPFN_LOW_MMIO}, |
786 | {LEGACY_IO_START, LEGACY_IO_SIZE, GPFN_LEGACY_IO}, | 786 | {LEGACY_IO_START, LEGACY_IO_SIZE, GPFN_LEGACY_IO}, |