hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Marc Zyngier 2018-10-01 13:41:32 +01:00
parent bca607ebc7
commit 9d47bb0d9e
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
virt/kvm/arm/arm.c
View File

@ -1310,16 +1310,10 @@ static void cpu_hyp_reinit(void)
{ {
cpu_hyp_reset(); cpu_hyp_reset();
if (is_kernel_in_hyp_mode()) { 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();
kvm_timer_init_vhe(); kvm_timer_init_vhe();
} else { else
cpu_init_hyp_mode(NULL); cpu_init_hyp_mode(NULL);
}
if (vgic_present) if (vgic_present)
kvm_vgic_init_cpu_hardware(); kvm_vgic_init_cpu_hardware();