36 lines
1.0 KiB
Diff
36 lines
1.0 KiB
Diff
From: Paolo Bonzini <pbonzini@redhat.com>
|
|
Date: Mon, 20 May 2019 12:06:36 +0200
|
|
Subject: [05/11] kvm: fix compilation on s390
|
|
Origin: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable.git/commit?id=bef6507903d91be2d1a06c11d980a722b176bc09
|
|
|
|
commit d30b214d1d0addb7b2c9c78178d1501cd39a01fb upstream.
|
|
|
|
s390 does not have memremap, even though in this particular case it
|
|
would be useful.
|
|
|
|
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
|
|
Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
|
|
Signed-off-by: Sasha Levin <sashal@kernel.org>
|
|
---
|
|
virt/kvm/kvm_main.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/virt/kvm/kvm_main.c b/virt/kvm/kvm_main.c
|
|
index 4a5ea263edf6..f99b99b77a48 100644
|
|
--- a/virt/kvm/kvm_main.c
|
|
+++ b/virt/kvm/kvm_main.c
|
|
@@ -1722,8 +1722,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)
|
|
--
|
|
2.27.0.rc0
|
|
|