]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
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)
committerKhalid Elmously <khalid.elmously@canonical.com>
Tue, 27 Feb 2018 16:33:17 +0000 (11:33 -0500)
commitd9a9e44769e2f5416a4cf996ede4c316cec0688d
treee45d9ad101d741b59d9cc577a653f1a29a203225
parent3050b657d08448c4b401bd474e0e721a805353e5
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: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
(cherry picked from commit 591862b560003518dfc369d44d1e177d96f7104c)

CVE-2017-5753
CVE-2017-5715
CVE-2017-5754

Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
Acked-by: Brad Figg <brad.figg@canonical.com>
Acked-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
arch/arm/include/asm/kvm_psci.h [deleted file]
arch/arm/kvm/handle_exit.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]
virt/kvm/arm/arm.c
virt/kvm/arm/psci.c