Commit 1a2fb94e authored by Marc Zyngier's avatar Marc Zyngier Committed by Catalin Marinas

arm/arm64: KVM: Consolidate the PSCI include files

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: default avatarChristoffer Dall <christoffer.dall@linaro.org>
Tested-by: default avatarArd Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent f5115e88
/*
* Copyright (C) 2012 - ARM Ltd
* Author: Marc Zyngier <marc.zyngier@arm.com>
*
* 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 <http://www.gnu.org/licenses/>.
*/
#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__ */
...@@ -21,7 +21,7 @@ ...@@ -21,7 +21,7 @@
#include <asm/kvm_emulate.h> #include <asm/kvm_emulate.h>
#include <asm/kvm_coproc.h> #include <asm/kvm_coproc.h>
#include <asm/kvm_mmu.h> #include <asm/kvm_mmu.h>
#include <asm/kvm_psci.h> #include <kvm/arm_psci.h>
#include <trace/events/kvm.h> #include <trace/events/kvm.h>
#include "trace.h" #include "trace.h"
......
...@@ -22,13 +22,14 @@ ...@@ -22,13 +22,14 @@
#include <linux/kvm.h> #include <linux/kvm.h>
#include <linux/kvm_host.h> #include <linux/kvm_host.h>
#include <kvm/arm_psci.h>
#include <asm/esr.h> #include <asm/esr.h>
#include <asm/exception.h> #include <asm/exception.h>
#include <asm/kvm_asm.h> #include <asm/kvm_asm.h>
#include <asm/kvm_coproc.h> #include <asm/kvm_coproc.h>
#include <asm/kvm_emulate.h> #include <asm/kvm_emulate.h>
#include <asm/kvm_mmu.h> #include <asm/kvm_mmu.h>
#include <asm/kvm_psci.h>
#include <asm/debug-monitors.h> #include <asm/debug-monitors.h>
#include <asm/traps.h> #include <asm/traps.h>
......
...@@ -15,8 +15,8 @@ ...@@ -15,8 +15,8 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>. * along with this program. If not, see <http://www.gnu.org/licenses/>.
*/ */
#ifndef __ARM64_KVM_PSCI_H__ #ifndef __KVM_ARM_PSCI_H__
#define __ARM64_KVM_PSCI_H__ #define __KVM_ARM_PSCI_H__
#define KVM_ARM_PSCI_0_1 1 #define KVM_ARM_PSCI_0_1 1
#define KVM_ARM_PSCI_0_2 2 #define KVM_ARM_PSCI_0_2 2
...@@ -24,4 +24,4 @@ ...@@ -24,4 +24,4 @@
int kvm_psci_version(struct kvm_vcpu *vcpu); int kvm_psci_version(struct kvm_vcpu *vcpu);
int kvm_psci_call(struct kvm_vcpu *vcpu); int kvm_psci_call(struct kvm_vcpu *vcpu);
#endif /* __ARM64_KVM_PSCI_H__ */ #endif /* __KVM_ARM_PSCI_H__ */
...@@ -31,6 +31,7 @@ ...@@ -31,6 +31,7 @@
#include <linux/irqbypass.h> #include <linux/irqbypass.h>
#include <trace/events/kvm.h> #include <trace/events/kvm.h>
#include <kvm/arm_pmu.h> #include <kvm/arm_pmu.h>
#include <kvm/arm_psci.h>
#define CREATE_TRACE_POINTS #define CREATE_TRACE_POINTS
#include "trace.h" #include "trace.h"
...@@ -46,7 +47,6 @@ ...@@ -46,7 +47,6 @@
#include <asm/kvm_mmu.h> #include <asm/kvm_mmu.h>
#include <asm/kvm_emulate.h> #include <asm/kvm_emulate.h>
#include <asm/kvm_coproc.h> #include <asm/kvm_coproc.h>
#include <asm/kvm_psci.h>
#include <asm/sections.h> #include <asm/sections.h>
#ifdef REQUIRES_VIRT #ifdef REQUIRES_VIRT
......
...@@ -21,9 +21,10 @@ ...@@ -21,9 +21,10 @@
#include <asm/cputype.h> #include <asm/cputype.h>
#include <asm/kvm_emulate.h> #include <asm/kvm_emulate.h>
#include <asm/kvm_psci.h>
#include <asm/kvm_host.h> #include <asm/kvm_host.h>
#include <kvm/arm_psci.h>
#include <uapi/linux/psci.h> #include <uapi/linux/psci.h>
/* /*
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment