arm/arm64: KVM: Consolidate the PSCI include files
authorMarc Zyngier <marc.zyngier@arm.com>
Tue, 6 Feb 2018 17:56:08 +0000 (17:56 +0000)
committerHaibo Chen <haibo.chen@nxp.com>
Thu, 12 Apr 2018 10:46:29 +0000 (18:46 +0800)
commit278ee79f78157bbf78b72b4a233b75f14c7986df
tree867ec69ff6fe825d186d2575c17a2393c6ca2757
parentfcfb24204150e6b11841784b692a8bf43ed1c0a9
arm/arm64: KVM: Consolidate the PSCI include files

commit 1a2fb94e6a77 upstream.

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 <christoffer.dall@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Alex Shi <alex.shi@linaro.org>
Conflicts:
need kvm/arm_psci.h in files:
arch/arm64/kvm/handle_exit.c
arch/arm/kvm/psci.c and arch/arm/kvm/arm.c
no virt/kvm/arm/arm.c and virt/kvm/arm/psci.c
arch/arm/include/asm/kvm_psci.h [deleted file]
arch/arm/kvm/arm.c
arch/arm/kvm/handle_exit.c
arch/arm/kvm/psci.c
arch/arm64/include/asm/kvm_psci.h [deleted file]
arch/arm64/kvm/handle_exit.c
include/kvm/arm_psci.h [new file with mode: 0644]