LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] kvm: fix compilation on s390
@ 2019-05-24 19:25 Paolo Bonzini
  2019-05-24 19:54 ` Christian Borntraeger
  2019-05-24 20:24 ` Michal Kubecek
  0 siblings, 2 replies; 5+ messages in thread
From: Paolo Bonzini @ 2019-05-24 19:25 UTC (permalink / raw)
  To: linux-kernel, kvm; +Cc: mkubecek

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

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 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 1fadfb9cf36e..134ec0283a8a 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)
-- 
1.8.3.1


^ permalink raw reply	[flat|nested] 5+ messages in thread

end of thread, other threads:[~2019-05-24 20:46 UTC | newest]

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-05-24 19:25 [PATCH] kvm: fix compilation on s390 Paolo Bonzini
2019-05-24 19:54 ` Christian Borntraeger
2019-05-24 19:56   ` Paolo Bonzini
2019-05-24 20:24 ` Michal Kubecek
2019-05-24 20:45   ` Paolo Bonzini

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).