Commit 9d47bb0d authored by Marc Zyngier's avatar Marc Zyngier
Browse files

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: default avatarEric Auger <eric.auger@redhat.com>
Reviewed-by: default avatarSuzuki K Poulose <suzuki.poulose@arm.com>
Signed-off-by: default avatarMarc Zyngier <marc.zyngier@arm.com>
parent bca607eb

virt/kvm/arm/arm.c

+2 −8
Original line number Diff line number Diff line
@@ -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();

CRA Git | Maintained and supported by SUSTech CRA and CCSE