From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jan Kiszka Subject: [PATCH] KVM: x86: Drop unneeded CONFIG_HAS_IOMEM check Date: Mon, 12 Oct 2009 08:51:40 +0200 Message-ID: <4AD2D1FC.3040707@web.de> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="------------enig1D7E9C670B7FD21FF45110F4" Cc: kvm-devel To: Marcelo Tosatti , Avi Kivity Return-path: Received: from fmmailgate02.web.de ([217.72.192.227]:53638 "EHLO fmmailgate02.web.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752827AbZJLGwT (ORCPT ); Mon, 12 Oct 2009 02:52:19 -0400 Sender: kvm-owner@vger.kernel.org List-ID: This is an OpenPGP/MIME signed message (RFC 2440 and 3156) --------------enig1D7E9C670B7FD21FF45110F4 Content-Type: text/plain; charset=ISO-8859-15 Content-Transfer-Encoding: quoted-printable 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 --- 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 11a6f2f..12de5bb 100644 --- a/arch/x86/kvm/x86.c +++ b/arch/x86/kvm/x86.c @@ -3802,7 +3802,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 =3D 1; @@ -3820,7 +3819,6 @@ int kvm_arch_vcpu_ioctl_run(struct kvm_vcpu *vcpu, = struct kvm_run *kvm_run) goto out; } } -#endif if (kvm_run->exit_reason =3D=3D KVM_EXIT_HYPERCALL) kvm_register_write(vcpu, VCPU_REGS_RAX, kvm_run->hypercall.ret); --------------enig1D7E9C670B7FD21FF45110F4 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.9 (GNU/Linux) Comment: Using GnuPG with SUSE - http://enigmail.mozdev.org iEYEARECAAYFAkrS0fwACgkQitSsb3rl5xRg8ACgqByXU7bop9RFnQVezQDmbWq5 9FsAoKBvB0Wix4CmEV404+S/MiaZeYMu =obzl -----END PGP SIGNATURE----- --------------enig1D7E9C670B7FD21FF45110F4--