Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Subject: Re: [PATCH] kvm: fix compilation on s390
To:     Christian Borntraeger <borntraeger@de.ibm.com>,
        linux-kernel@vger.kernel.org, kvm@vger.kernel.org
Cc:     mkubecek@suse.cz
References: <1558725957-22998-1-git-send-email-pbonzini@redhat.com>
 <d34269ea-054f-4dee-4485-3121cb3255c1@de.ibm.com>
From:   Paolo Bonzini <pbonzini@redhat.com>
Message-ID: <3d1b18d4-4d8d-3738-aa49-34ea28c02c84@redhat.com>
Date:   Fri, 24 May 2019 21:56:14 +0200
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101
 Thunderbird/60.6.1
MIME-Version: 1.0
In-Reply-To: <d34269ea-054f-4dee-4485-3121cb3255c1@de.ibm.com>
Content-Type: text/plain; charset=utf-8
Content-Language: en-US
Content-Transfer-Encoding: 7bit
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk

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)
>>
>