From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id D81FEC282E3 for ; Fri, 24 May 2019 19:56:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id B0AE9217D7 for ; Fri, 24 May 2019 19:56:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391815AbfEXT4S (ORCPT ); Fri, 24 May 2019 15:56:18 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:38778 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391455AbfEXT4S (ORCPT ); Fri, 24 May 2019 15:56:18 -0400 Received: by mail-wm1-f67.google.com with SMTP id t5so10317676wmh.3 for ; Fri, 24 May 2019 12:56:16 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=0GEOz5AbCK75BUSbgRcvRqBVy9AZ5+iXTj72Y9RfMlA=; b=Z3Nh2lMozSh9XhwlKOgzxWTt3aS739eU0DgkvNhRS8i9ve5wWXterJ1k2wXug2d9Kh IWoQnOlNEx1Xu89ptj+2FpKdNHoj+ZvHJpGDx/frXShhnMg4NuhEk1/gRg775d9c8EdT +ByTD+uLpWRNfo2HjedTryTBosqpo5MRvoMdEtiNViHzt/c58wc9N+YDqtZaIunJ606r KigWlyquoNt0+qh+oFvq6NOSr3arb/VDtgmv5ikbGJnoD9h4sAMya1UBYkYO9Nozj/M+ zEa4KYTMDks+HC2ycRLx4M+CSoHujsWpFdd0oo4l8BvjknAt25HZWMhAGelLFp9akOXI /4sA== X-Gm-Message-State: APjAAAVw9GMfecOVMbaRQ7EsfqNEuv50igIgJ6eue4XdGZhxWaIXJbVR pG9M9jNe46AzlvpabPxPTgjxboOc0JU= X-Google-Smtp-Source: APXvYqxgi6dIDb+oYqkiOUpuLaxFRX75R+mVqegTHw/M3edO1w3QJ9KzaXUqr5BWvWGo2K92e3/R7A== X-Received: by 2002:a1c:9e92:: with SMTP id h140mr1065764wme.82.1558727776217; Fri, 24 May 2019 12:56:16 -0700 (PDT) Received: from ?IPv6:2001:b07:6468:f312:4d53:18d:3ffd:370? ([2001:b07:6468:f312:4d53:18d:3ffd:370]) by smtp.gmail.com with ESMTPSA id l18sm3646158wrv.38.2019.05.24.12.56.15 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 May 2019 12:56:15 -0700 (PDT) Subject: Re: [PATCH] kvm: fix compilation on s390 To: Christian Borntraeger , linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: mkubecek@suse.cz References: <1558725957-22998-1-git-send-email-pbonzini@redhat.com> From: Paolo Bonzini 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: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 >> --- >> 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) >> >