Messages in this thread | | | Subject | Re: [PATCH] kvm: fix compilation on s390 | From | Paolo Bonzini <> | Date | Fri, 24 May 2019 21:56:14 +0200 |
| |
On 24/05/19 21:54, Christian Borntraeger wrote: > On which kernel tree is this broken? kvm/queue has > > #ifdef CONFIG_ZONE_DEVICE > around that.
It's a better version of that patch in kvm/queue, which I had committed just to temporarily unbreak you guys.
Paolo
> On 24.05.19 21:25, Paolo Bonzini wrote: >> 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) >> >
| |