From: Marc Zyngier <marc.zyngier@arm.com>
Date: Mon, 1 Oct 2018 12:41:32 +0000 (+0100)
Subject: KVM: arm64: Drop __cpu_init_stage2 on the VHE path
X-Git-Tag: v5.4-rc1~2365^2~5^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9d47bb0d9ea8528373b4c6f9bca6c7f402900297;p=platform%2Fkernel%2Flinux-rpi.git

KVM: arm64: Drop __cpu_init_stage2 on the VHE path

__cpu_init_stage2 doesn't do anything anymore on arm64, and is
totally non-sensical if running VHE (as VHE is 64bit only).

Reviewed-by: Eric Auger <eric.auger@redhat.com>
Reviewed-by: Suzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
---

diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
index 91c464c..4ce99bb 100644
--- a/virt/kvm/arm/arm.c
+++ b/virt/kvm/arm/arm.c
@@ -1310,16 +1310,10 @@ static void cpu_hyp_reinit(void)
 {
 	cpu_hyp_reset();
 
-	if (is_kernel_in_hyp_mode()) {
-		/*
-		 * __cpu_init_stage2() is safe to call even if the PM
-		 * event was cancelled before the CPU was reset.
-		 */
-		__cpu_init_stage2();
+	if (is_kernel_in_hyp_mode())
 		kvm_timer_init_vhe();
-	} else {
+	else
 		cpu_init_hyp_mode(NULL);
-	}
 
 	if (vgic_present)
 		kvm_vgic_init_cpu_hardware();