From db982c37be15145b973791ffa8440a8b686cdaa6 Mon Sep 17 00:00:00 2001
From: Jan Kiszka <jan.kiszka@web.de>
Date: Mon, 12 Oct 2009 08:51:40 +0200
Subject: [PATCH] --- yaml --- r: 172309 b: refs/heads/master c:
 94c30d9ca6fd00a69e367b91b6e13572c41938c5 h: refs/heads/master i:   172307:
 b535cdbdb125b9c972e7c77c0835218019bdd017 v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/kvm/x86.c | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/[refs] b/[refs]
index 143ff3184cdd..ff34409d67e3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9fb41ba8962b18159e16cac81e7d57e897964038
+refs/heads/master: 94c30d9ca6fd00a69e367b91b6e13572c41938c5
diff --git a/trunk/arch/x86/kvm/x86.c b/trunk/arch/x86/kvm/x86.c
index 3cffa2cac70b..5d450cc6f841 100644
--- a/trunk/arch/x86/kvm/x86.c
+++ b/trunk/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);