Commit 60f9a9ef authored by Xiao Guangrong's avatar Xiao Guangrong Committed by Avi Kivity

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: default avatarXiao Guangrong <xiaoguangrong@linux.vnet.ibm.com>
Signed-off-by: default avatarAvi Kivity <avi@redhat.com>
parent f85e2cb5
...@@ -774,13 +774,13 @@ struct kvm *kvm_arch_alloc_vm(void) ...@@ -774,13 +774,13 @@ struct kvm *kvm_arch_alloc_vm(void)
return kvm; return kvm;
} }
struct kvm_io_range { struct kvm_ia64_io_range {
unsigned long start; unsigned long start;
unsigned long size; unsigned long size;
unsigned long type; 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}, {VGA_IO_START, VGA_IO_SIZE, GPFN_FRAME_BUFFER},
{MMIO_START, MMIO_SIZE, GPFN_LOW_MMIO}, {MMIO_START, MMIO_SIZE, GPFN_LOW_MMIO},
{LEGACY_IO_START, LEGACY_IO_SIZE, GPFN_LEGACY_IO}, {LEGACY_IO_START, LEGACY_IO_SIZE, GPFN_LEGACY_IO},
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment