diff options
| author | Jan Kiszka <jan.kiszka@web.de> | 2009-10-12 08:51:40 +0200 |
|---|---|---|
| committer | Avi Kivity <avi@redhat.com> | 2009-12-03 09:32:18 +0200 |
| commit | 94c30d9ca6fd00a69e367b91b6e13572c41938c5 (patch) | |
| tree | 5075c2b883b3b68f01984d81c3e983977f6c72e9 | |
| parent | 9fb41ba8962b18159e16cac81e7d57e897964038 (diff) | |
| download | op-kernel-dev-94c30d9ca6fd00a69e367b91b6e13572c41938c5.zip op-kernel-dev-94c30d9ca6fd00a69e367b91b6e13572c41938c5.tar.gz | |
KVM: x86: Drop unneeded CONFIG_HAS_IOMEM check
This (broken) check dates back to the days when this code was shared
across architectures. x86 has IOMEM, so drop it.
Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
| -rw-r--r-- | arch/x86/kvm/x86.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/arch/x86/kvm/x86.c b/arch/x86/kvm/x86.c index 3cffa2c..5d450cc 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3814,7 +3814,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) if (r) goto out; } -#if CONFIG_HAS_IOMEM if (vcpu->mmio_needed) { memcpy(vcpu->mmio_data, kvm_run->mmio.data, 8); vcpu->mmio_read_completed = 1; @@ -3832,7 +3831,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, struct kvm_run *kvm_run) goto out; } } -#endif if (kvm_run->exit_reason == KVM_EXIT_HYPERCALL) kvm_register_write(vcpu, VCPU_REGS_RAX, kvm_run->hypercall.ret); |
