diff options
| author | Xiao Guangrong <xiaoguangrong@linux.vnet.ibm.com> | 2011-11-24 18:09:11 +0800 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2011-12-27 11:17:43 +0200 |
| commit | 60f9a9ef5492cae66aca2ad9873360161320d5af (patch) | |
| tree | 9fc03198a5aad6491e39fa2410f0a82648f75688 | |
| parent | f85e2cb5dbaf905e9470d3fe099b31619da431fc (diff) | |
| download | op-kernel-dev-60f9a9ef5492cae66aca2ad9873360161320d5af.zip op-kernel-dev-60f9a9ef5492cae66aca2ad9873360161320d5af.tar.gz | |
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>
| -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 92d9f1e..4050520 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) 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}, |
