Received: by 10.223.176.5 with SMTP id f5csp950493wra; Tue, 6 Feb 2018 10:00:04 -0800 (PST) X-Google-Smtp-Source: AH8x224/ZKccY6ZUlQ2kt71D2ie3R7FLMU8o9qV/zA9gF/z+wcb98K+EEBReeqWOqLtcZvfo2Gag X-Received: by 2002:a17:902:4181:: with SMTP id f1-v6mr3198612pld.59.1517940004635; Tue, 06 Feb 2018 10:00:04 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517940004; cv=none; d=google.com; s=arc-20160816; b=SL55tTc6cgKe1FISOOUwRmnjQw7306KnQRrFkD5d5tsVnWz5NtyJ0KTOPfsjNntLZV fXcY6MOy0ysYho7InO839aGeNIssw8gQhFjJYMc3FaOKOYiA/isqAEkmQozFEzRQNj8Q +k9m7JpILcBvCLhIH6E79Pg+YVpd4SPT5bR99PiGJdrtciM7w/Th7NwHfvjYo2OKtn2/ jl9z7TBfdoU8qby2rlsa4nta8caJFTv3b8aev5pDxlK3TWYBDGALUAJj/N0L5uz7CdR4 8ZxrzFI6YdAkkp1CwL/Z/HEcFrRtBXFq+YRCwqsEIs+lNgueOFNH8PB5F54UBTdS88yQ anyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=W2lBbYsuOEkG8toSDg3afiup5MO3sc/UGjgPRbJV/aQ=; b=cW6ROpLJTrts93wtalEPtj0Ae57xenUbBolaoQJhuPqrmFwq4UiyJTSSPHGhYWJ7Kr pEFGKexahEhXAZH4yMXsvhFj4zuBiH6bAvRxMgLjJsPrsAZ93SvFU8cQhZcPa5eky98Y fr8KeHgDQ6QOEl3pNJWFWREXeFZjc2pYAP2Dk1QpL2YPf9HGOqFehriG0P3LJ+GYgUDU 2T9Jfxj3WrOaNDsDHRxDBOtU1pQbzO6H6eyiJCCoji9IVQqPLbOzrxsaAZolmbB1275m WsnMgDFuAeN+Fry68WwSCAC6wK2Ou9qMjZ+II/S+vyW1HOATeqBoInMPW5svqWFZI5IB 2y7w== ARC-Authentication-Results: i=1; mx.google.com; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e92-v6si1943538pld.643.2018.02.06.09.59.50; Tue, 06 Feb 2018 10:00:04 -0800 (PST) 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; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752866AbeBFR5g (ORCPT + 99 others); Tue, 6 Feb 2018 12:57:36 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:40988 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752721AbeBFR46 (ORCPT ); Tue, 6 Feb 2018 12:56:58 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 557AC1650; Tue, 6 Feb 2018 09:56:58 -0800 (PST) Received: from approximate.cambridge.arm.com (approximate.cambridge.arm.com [10.1.207.62]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id A80D53F25C; Tue, 6 Feb 2018 09:56:55 -0800 (PST) From: Marc Zyngier To: linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu Cc: Catalin Marinas , Will Deacon , Peter Maydell , Christoffer Dall , Lorenzo Pieralisi , Mark Rutland , Robin Murphy , Ard Biesheuvel , Andrew Jones , Hanjun Guo , Jayachandran C , Jon Masters , Russell King - ARM Linux Subject: [PATCH v4 04/17] arm/arm64: KVM: Consolidate the PSCI include files Date: Tue, 6 Feb 2018 17:56:08 +0000 Message-Id: <20180206175621.929-5-marc.zyngier@arm.com> X-Mailer: git-send-email 2.14.2 In-Reply-To: <20180206175621.929-1-marc.zyngier@arm.com> References: <20180206175621.929-1-marc.zyngier@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org As we're about to update the PSCI support, and because I'm lazy, let's move the PSCI include file to include/kvm so that both ARM architectures can find it. Acked-by: Christoffer Dall Tested-by: Ard Biesheuvel Signed-off-by: Marc Zyngier --- arch/arm/include/asm/kvm_psci.h | 27 ---------------------- arch/arm/kvm/handle_exit.c | 2 +- arch/arm64/kvm/handle_exit.c | 3 ++- .../asm/kvm_psci.h => include/kvm/arm_psci.h | 6 ++--- virt/kvm/arm/arm.c | 2 +- virt/kvm/arm/psci.c | 3 ++- 6 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 arch/arm/include/asm/kvm_psci.h rename arch/arm64/include/asm/kvm_psci.h => include/kvm/arm_psci.h (89%) diff --git a/arch/arm/include/asm/kvm_psci.h b/arch/arm/include/asm/kvm_psci.h deleted file mode 100644 index 6bda945d31fa..000000000000 --- a/arch/arm/include/asm/kvm_psci.h +++ /dev/null @@ -1,27 +0,0 @@ -/* - * Copyright (C) 2012 - ARM Ltd - * Author: Marc Zyngier - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License version 2 as - * published by the Free Software Foundation. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ - -#ifndef __ARM_KVM_PSCI_H__ -#define __ARM_KVM_PSCI_H__ - -#define KVM_ARM_PSCI_0_1 1 -#define KVM_ARM_PSCI_0_2 2 - -int kvm_psci_version(struct kvm_vcpu *vcpu); -int kvm_psci_call(struct kvm_vcpu *vcpu); - -#endif /* __ARM_KVM_PSCI_H__ */ diff --git a/arch/arm/kvm/handle_exit.c b/arch/arm/kvm/handle_exit.c index a4bf0f6f024a..230ae4079108 100644 --- a/arch/arm/kvm/handle_exit.c +++ b/arch/arm/kvm/handle_exit.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include "trace.h" diff --git a/arch/arm64/kvm/handle_exit.c b/arch/arm64/kvm/handle_exit.c index 5493bbefbd0d..588f910632a7 100644 --- a/arch/arm64/kvm/handle_exit.c +++ b/arch/arm64/kvm/handle_exit.c @@ -22,13 +22,14 @@ #include #include +#include + #include #include #include #include #include #include -#include #include #include diff --git a/arch/arm64/include/asm/kvm_psci.h b/include/kvm/arm_psci.h similarity index 89% rename from arch/arm64/include/asm/kvm_psci.h rename to include/kvm/arm_psci.h index bc39e557c56c..2042bb909474 100644 --- a/arch/arm64/include/asm/kvm_psci.h +++ b/include/kvm/arm_psci.h @@ -15,8 +15,8 @@ * along with this program. If not, see . */ -#ifndef __ARM64_KVM_PSCI_H__ -#define __ARM64_KVM_PSCI_H__ +#ifndef __KVM_ARM_PSCI_H__ +#define __KVM_ARM_PSCI_H__ #define KVM_ARM_PSCI_0_1 1 #define KVM_ARM_PSCI_0_2 2 @@ -24,4 +24,4 @@ int kvm_psci_version(struct kvm_vcpu *vcpu); int kvm_psci_call(struct kvm_vcpu *vcpu); -#endif /* __ARM64_KVM_PSCI_H__ */ +#endif /* __KVM_ARM_PSCI_H__ */ diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 15bf026eb182..af3e98fc377e 100644 --- a/virt/kvm/arm/arm.c +++ b/virt/kvm/arm/arm.c @@ -31,6 +31,7 @@ #include #include #include +#include #define CREATE_TRACE_POINTS #include "trace.h" @@ -46,7 +47,6 @@ #include #include #include -#include #include #ifdef REQUIRES_VIRT diff --git a/virt/kvm/arm/psci.c b/virt/kvm/arm/psci.c index f1e363bab5e8..b322e46fd142 100644 --- a/virt/kvm/arm/psci.c +++ b/virt/kvm/arm/psci.c @@ -21,9 +21,10 @@ #include #include -#include #include +#include + #include /* -- 2.14.2