Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp847892ybi; Fri, 24 May 2019 12:27:24 -0700 (PDT) X-Google-Smtp-Source: APXvYqx5OMDsKxC5JvNbb5LzsKmFKZk2ZSw/42rmpxnQ98ht9YgVumJX5hfCz7smsiTPqs9XoWC6 X-Received: by 2002:a17:902:be0e:: with SMTP id r14mr90658296pls.152.1558726044704; Fri, 24 May 2019 12:27:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558726044; cv=none; d=google.com; s=arc-20160816; b=DX3Rio6XWWJR5d+VnRXV2ddoGpDoILneBDdKmJ+tzvfYop3qNjWLRoBqLTtRCOYomp kYvFQVXwtIWvNlcjTHOMM0hae8XXdABkoikOj801Q074QgR2S4gUxewQh/Pme7IVCIuq tzyME5vWTJQQkfNCn0uzRogdO9LR4ZfKJW3dTMsm3pZ662PNBbL9oWeEkTsJtND/O4GR IEUNhZCBdCNm9lBgx8ayedikNPCcbRhVp+X3vObzOPypDgp0Sf4M1dXOWEpFbykGrqkv 4fn8nZOsbHumzu8K/9lwIlgvtSflCIloYlnaMnj9atnMvXvw31JnTxd09lrYSQhraRkg 1LqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:message-id:date:subject:cc:to:from :dkim-signature; bh=b3Gt3nCXb0rhnImTl+/ddhNNml+7l/9DP/rB9AdAbXQ=; b=KSBreSXSgFjl3e1L3vWX14C+3MUADvgkco3xEGHofhA/a4xf3S1NiX3Ch1uBNuVmc0 nXMkt0vUbDLgTKel1aGSCdD3c1WmxGlZSe2QAhmvl2Ui6KN8JJf7GUn82d6EA9sM6Qsr 4L49HbFNxs/h3nvWMIYJrFeOac1OAI/bzkW7YtZkIcFiKhg/UDt8hM05RQNASCe0+Jgv 3Xg6i/0pXLXYQrjYzPOGWWeC+Zq1UXOBho5gBq3cWLm7c9rqjURvFrYkMMT/6qy+QZg+ Z6eu/0oUyNskFU+cMQ082h7rj7COoBuiYS0jTq/LL0WMxykeWNGbDmCmz8DsHe+xqTac LOwA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=sL7oJAkj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d6si5444631plo.396.2019.05.24.12.27.09; Fri, 24 May 2019 12:27:24 -0700 (PDT) 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; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=sL7oJAkj; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391612AbfEXT0C (ORCPT + 99 others); Fri, 24 May 2019 15:26:02 -0400 Received: from mail-wr1-f66.google.com ([209.85.221.66]:42248 "EHLO mail-wr1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729597AbfEXT0C (ORCPT ); Fri, 24 May 2019 15:26:02 -0400 Received: by mail-wr1-f66.google.com with SMTP id l2so11057763wrb.9; Fri, 24 May 2019 12:26:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id; bh=b3Gt3nCXb0rhnImTl+/ddhNNml+7l/9DP/rB9AdAbXQ=; b=sL7oJAkjFMOlhtC4l/nYSpc36PhbTiok7yW75uDyMZi7i/pA2E1Xs4P+ueugu3HEx2 fiiXAMK0P0/gF7mq9uy7NLd9UVFFlc7JvDAhw8b4TOaRD6hWJSo9SNND8MINlwZnY7Hr IUeu5SzruvjUq5WOTptZxspf9mJHCLA6IYXEwB5u6hkIX6Sccn706fhuLQjivBJYuSPZ +uIEElFTSZgw3GtvvCN8YGvB7LRRpjSyj9MqKGXByVl+phiFKCaZUXbvlk2UhlddmhPl vbHC7Un+sH7Yoyskv3fc8+yyi68NrT2ds8kAp5DfyYlu8cvf4x+Qcu7YGgv4Pv8yL3Dx Jw/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id; bh=b3Gt3nCXb0rhnImTl+/ddhNNml+7l/9DP/rB9AdAbXQ=; b=SvChrcK8xlb5bGvpCQqc0i6aDBLHrCTDiN1zHc02g/iZCGi19DhuR7UsBr+pGV5LSh OcISj3yPMkhqyIHEtibBQT1f4bk+97XVxC/FkCrecFUIXrF5IMJSIwRf7EShJRref5IC hJNBQJTHaogoG6ot+vMIrs/AIHWINruA+NMK0iFAa5A9e5ZGEY3lXbi9uz0QEMI5Sm5A nOQTaYVZ8+tg2/hX/JIyzksY5NkczFN0zvoboZJ/ub/4YxsXJS8J/MJY0zzj+PggAtty jW1D0N++vlaPqcEHQ9hsSyfbQ+2TbQY9TXqM5vV65rUtoYwgfsesW6O2D3WLJoT0GOFh hEOA== X-Gm-Message-State: APjAAAXDNcPNILRKatwirJ6hLGC6/YmaXZfrqklt4Uv6EY6R3oDidw6w o0lddIiNiUEitiMHTNGThTQNN+To X-Received: by 2002:a5d:6402:: with SMTP id z2mr1100317wru.350.1558725960064; Fri, 24 May 2019 12:26:00 -0700 (PDT) Received: from 640k.lan ([93.56.166.5]) by smtp.gmail.com with ESMTPSA id s11sm682660wro.17.2019.05.24.12.25.59 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 24 May 2019 12:25:59 -0700 (PDT) From: Paolo Bonzini To: linux-kernel@vger.kernel.org, kvm@vger.kernel.org Cc: mkubecek@suse.cz Subject: [PATCH] kvm: fix compilation on s390 Date: Fri, 24 May 2019 21:25:57 +0200 Message-Id: <1558725957-22998-1-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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) -- 1.8.3.1