diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2018-10-01 14:41:32 +0200 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2018-10-03 12:48:30 +0200 |
| commit | 9d47bb0d9ea8528373b4c6f9bca6c7f402900297 (patch) | |
| tree | 19364fb3d9bc66cef681f1e66cc9531a9e26e7e4 /virt | |
| parent | KVM: arm/arm64: Rename kvm_arm_config_vm to kvm_arm_setup_stage2 (diff) | |
| download | linux-9d47bb0d9ea8528373b4c6f9bca6c7f402900297.tar.xz linux-9d47bb0d9ea8528373b4c6f9bca6c7f402900297.zip | |
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>
Diffstat (limited to 'virt')
| -rw-r--r-- | virt/kvm/arm/arm.c | 10 |
1 files changed, 2 insertions, 8 deletions
diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c index 91c464c9cd21..4ce99bb223bc 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(); |