OSDN Git Service

arm/arm64: KVM: Consolidate the PSCI include files
authorMark Rutland <mark.rutland@arm.com>
Thu, 12 Apr 2018 11:11:24 +0000 (12:11 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 20 Apr 2018 06:21:04 +0000 (08:21 +0200)
commit8b106affdfb63b6fd71c49b230c942fa525d8a0c
treecdb98e5a00d9f2166fa562bd119d303eb5e2812e
parente06ea9af0fb58e46771569fded5b3bd75fdd2dc9
arm/arm64: KVM: Consolidate the PSCI include files

From: Marc Zyngier <marc.zyngier@arm.com>

commit 1a2fb94e6a771ff94f4afa22497a4695187b820c 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>
[v4.9: account for files moved to virt/ upstream]
Signed-off-by: Mark Rutland <mark.rutland@arm.com> [v4.9 backport]
Tested-by: Greg Hackmann <ghackmann@google.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
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/kvm/handle_exit.c
include/kvm/arm_psci.h [moved from arch/arm64/include/asm/kvm_psci.h with 89% similarity]