From: Paolo Bonzini <pbonzini@redhat.com>
Date: Mon, 20 May 2019 10:06:36 +0000 (+0200)
Subject: kvm: fix compilation on s390
X-Git-Tag: v5.4-rc1~591^2~132
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d30b214d1d0addb7b2c9c78178d1501cd39a01fb;p=platform%2Fkernel%2Flinux-rpi.git

kvm: fix compilation on s390

s390 does not have memremap, even though in this particular case it
would be useful.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---

diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
index 1fadfb9..134ec02 100644
--- a/virt/kvm/kvm_main.c
+++ b/virt/kvm/kvm_main.c
@@ -1761,8 +1761,10 @@ static int __kvm_map_gfn(struct kvm_memory_slot *slot, gfn_t gfn,
 	if (pfn_valid(pfn)) {
 		page = pfn_to_page(pfn);
 		hva = kmap(page);
+#ifdef CONFIG_HAS_IOMEM
 	} else {
 		hva = memremap(pfn_to_hpa(pfn), PAGE_SIZE, MEMREMAP_WB);
+#endif
 	}
 
 	if (!hva)