openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Xiao Guangrong 2011-11-24 18:09:11 +08:00 committed by Avi Kivity
parent f85e2cb5db
commit 60f9a9ef54
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arch/ia64/kvm/kvm-ia64.c
View File

@ -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},