From 9355a87b0c2c8c2e0d73bfec8c196761703d9f9d Mon Sep 17 00:00:00 2001 From: Xiao Guangrong Date: Thu, 24 Nov 2011 18:09:11 +0800 Subject: [PATCH] --- yaml --- r: 282026 b: refs/heads/master c: 60f9a9ef5492cae66aca2ad9873360161320d5af h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/ia64/kvm/kvm-ia64.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 8fc67efe6a63..d64c29cc31b9 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: f85e2cb5dbaf905e9470d3fe099b31619da431fc +refs/heads/master: 60f9a9ef5492cae66aca2ad9873360161320d5af diff --git a/trunk/arch/ia64/kvm/kvm-ia64.c b/trunk/arch/ia64/kvm/kvm-ia64.c index 92d9f1e4740f..405052002493 100644 --- a/trunk/arch/ia64/kvm/kvm-ia64.c +++ b/trunk/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},