From patchwork Sat Sep 16 00:31:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sean Christopherson X-Patchwork-Id: 140865 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp1427857vqi; Fri, 15 Sep 2023 18:50:36 -0700 (PDT) X-Google-Smtp-Source: AGHT+IG8HFh7EBnTPF0aN0uD36eJu/mL4PZbcyw+utVRs/RsXcVYaA5u/2EC81NWg1s58+toLg4U X-Received: by 2002:a05:6358:618c:b0:140:f6ab:b11e with SMTP id w12-20020a056358618c00b00140f6abb11emr4102483rww.28.1694829036408; Fri, 15 Sep 2023 18:50:36 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694829036; cv=none; d=google.com; s=arc-20160816; b=gQceiz4/AQ0O2zTjowm8nxfNKhyYYGV/FHac62C3UzbYtcoe3v8K/rAVUzKL/V3bRw 67bADD/v8gL5bDIHIB0zo974zqHscRGplI4k6aFS7umj1nKoZoZXTl+/UL7DykZzW3ry 9+7Xu4DHZgwG2/1yWEdhBvzkQdsDCKSdJ30lFRNrKSKbl1EPCsN3AHejNjXqjfZHVG8e Rk2nnBC9oGUv0Cy1WRi4iooTYdmLoTUjb92rgnqyJgu8knumlGnTgkwEiqJIkXoCRR4z 5QyG+a70vgLHUtFdHTMCAwRnT0z03iq2KRMtRg5PFW1L75waQkL3BLtAgx7BJoJ0saQU yqzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:cc:to:from:subject:message-id:references :mime-version:in-reply-to:date:reply-to:dkim-signature; bh=Fxp/wpw1LF0d8Fhe/2GDyJ/jS0kdkc80zXgNVrZkdeA=; fh=kXSkXFacTVTlVHq0XnHvR0iN61knZqi7sPJIGv3JAWo=; b=vt9NtkKDFy+gHC3VuiWZv9arsYMBf90eNiO4Qqhe5sYpWyvjPCZp6FGDDIWdGDkkLQ wHP/wUv94w2x0Does2Z38W9nbGhU/FUZnAQlT5UWaf8KIlFEFydP5hvJAlm8iKnIMi7n XGsypIwKLOjZcNWomHPWDC6MByCHsrSStpW5iSiNVddE6KA6rkHaYYCETrUpl7xfhbXv Dq8Cx/e15DvKLmFVximMIRH9/YyMbbHx0UfA/EoMtJKfonssYJKQPs2GRNkqG+FoVCMn Wi3VjrwukP6TpeYcPLAzlPbLi1BtjChrNvnDOvJC/sP7ELVtrnV7ZiYQJiC0N8AG/w2Z n/Ag== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=2fbwrzww; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from agentk.vger.email (agentk.vger.email. [23.128.96.32]) by mx.google.com with ESMTPS id r135-20020a632b8d000000b00563ef545828si4165790pgr.8.2023.09.15.18.50.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 15 Sep 2023 18:50:36 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20230601 header.b=2fbwrzww; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by agentk.vger.email (Postfix) with ESMTP id 1BF288300EDD; Fri, 15 Sep 2023 17:34:40 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at agentk.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238862AbjIPAdf (ORCPT + 28 others); Fri, 15 Sep 2023 20:33:35 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238666AbjIPAc1 (ORCPT ); Fri, 15 Sep 2023 20:32:27 -0400 Received: from mail-yb1-xb4a.google.com (mail-yb1-xb4a.google.com [IPv6:2607:f8b0:4864:20::b4a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id AC7E730CA for ; Fri, 15 Sep 2023 17:31:57 -0700 (PDT) Received: by mail-yb1-xb4a.google.com with SMTP id 3f1490d57ef6-d814a1f7378so7097536276.1 for ; Fri, 15 Sep 2023 17:31:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1694824317; x=1695429117; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:from:to:cc:subject:date:message-id:reply-to; bh=Fxp/wpw1LF0d8Fhe/2GDyJ/jS0kdkc80zXgNVrZkdeA=; b=2fbwrzwwcwMEdCJUr8RGBaUnDngKNB070PXZtyq30zQwjcm8IolGOgCF1XZmW1ompj IDBGVk8mkCcHAD4KXWzTkNV7Ai4zcL9LFKOqVR+Xrn3ZzRBGASphXPfjCS42L/CbasYL K1P6sVitcJCmYaiSyf0RbihIqVp7G7lJrQayuNjQMGiY9xwnVGQUE2V4qezFwn8FLTtm rsZHajwCTZ4KS+RQcnK4ZdWQULiNEGoZBZaSj6x/FhDkfbEN78LHV7ARbwSZ6RVVX/WF 6/fbeE2lkm75SHXs7lvSMGcOS3cXdtqsvcFNQCwpmLq8JB9OpLH8mxuNlMEnGJT5l7kM UoIg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694824317; x=1695429117; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:reply-to:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=Fxp/wpw1LF0d8Fhe/2GDyJ/jS0kdkc80zXgNVrZkdeA=; b=CpbAGqVswEr8CiTl7oYjmAYEkKeSeGaVKEoKCAvqLE0GYs8Jiklj9lEVk5G8UnQCl3 ODQoFw7mSpk1sKWFmNRNlMq2o8EAOl3NJ3tivenm7h92FysxnVgeUi92mgKt/3Ca35rD oJy7uEcS/TNTBk7wfdsljZ35mW+uAsJcdI+2DXuXTq2vuaoVnczUg8xOf/JA2bUsz/Xf j8RSu0vZtvbaTC9VIJhzt8JpWdQ2L+BTGBlyfQ6sDLcz/JgBMkBflqWQ92JQ+SnhRzdd 2WjSdesmDz92Esf5fQarseRHmZ8bV8hUJ7Fmxef1dXEvaHFZhd+NVxgJzukliiTen3rc 3HtA== X-Gm-Message-State: AOJu0Yw/BKGf2p7vWcTTLQPPIp7G8UNguqSWqtNIbM5T4DbChsltOnNt Jtm0vw45d6lrvOpfCCBECattcdFPc20= X-Received: from zagreus.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5c37]) (user=seanjc job=sendgmr) by 2002:a25:4444:0:b0:d80:8aa6:5ac0 with SMTP id r65-20020a254444000000b00d808aa65ac0mr190245yba.4.1694824316815; Fri, 15 Sep 2023 17:31:56 -0700 (PDT) Reply-To: Sean Christopherson Date: Fri, 15 Sep 2023 17:31:10 -0700 In-Reply-To: <20230916003118.2540661-1-seanjc@google.com> Mime-Version: 1.0 References: <20230916003118.2540661-1-seanjc@google.com> X-Mailer: git-send-email 2.42.0.459.ge4e396fd5e-goog Message-ID: <20230916003118.2540661-19-seanjc@google.com> Subject: [PATCH 18/26] KVM: s390: Stop adding virt/kvm to the arch include path From: Sean Christopherson To: Catalin Marinas , Will Deacon , Marc Zyngier , Oliver Upton , Huacai Chen , Michael Ellerman , Anup Patel , Paul Walmsley , Palmer Dabbelt , Albert Ou , Heiko Carstens , Vasily Gorbik , Alexander Gordeev , Christian Borntraeger , Janosch Frank , Claudio Imbrenda , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , x86@kernel.org, Peter Zijlstra , Arnaldo Carvalho de Melo , Sean Christopherson , Paolo Bonzini , Tony Krowiak , Halil Pasic , Jason Herne , Harald Freudenberger , Alex Williamson , Andy Lutomirski Cc: linux-arm-kernel@lists.infradead.org, kvmarm@lists.linux.dev, linux-mips@vger.kernel.org, kvm@vger.kernel.org, linuxppc-dev@lists.ozlabs.org, kvm-riscv@lists.infradead.org, linux-riscv@lists.infradead.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, Anish Ghulati , Venkatesh Srinivas , Andrew Thornton X-Spam-Status: No, score=-8.4 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on agentk.vger.email Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (agentk.vger.email [0.0.0.0]); Fri, 15 Sep 2023 17:34:40 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777157051510145557 X-GMAIL-MSGID: 1777157051510145557 Don't add virt/kvm to KVM s390's include path, the headers in virt/kvm are intended to be used only by other code in virt/kvm, i.e. are "private" to the core KVM code. It's not clear that s390 *ever* included a header from virt/kvm, i.e. odds are good the "-Ivirt/kvm" was copied from a x86's Makefile when s390 support was first added. The only headers in virt/kvm at the time were the x86 specific ioapic.h, and iodev.h, neither of which shows up as an #include in the diff for the commit range 37817f2982d0f..e976a2b997fc4. Signed-off-by: Sean Christopherson Reviewed-by: Thomas Huth Acked-by: Claudio Imbrenda --- arch/s390/kvm/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/s390/kvm/Makefile b/arch/s390/kvm/Makefile index 02217fb4ae10..f17249ab2a72 100644 --- a/arch/s390/kvm/Makefile +++ b/arch/s390/kvm/Makefile @@ -5,7 +5,7 @@ include $(srctree)/virt/kvm/Makefile.kvm -ccflags-y := -Ivirt/kvm -Iarch/s390/kvm +ccflags-y := -Iarch/s390/kvm kvm-y += kvm-s390.o intercept.o interrupt.o priv.o sigp.o kvm-y += diag.o gaccess.o guestdbg.o vsie.o pv.o