Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm

[mirror_ubuntu-bionic-kernel.git] / arch / arm / kvm / arm.c

diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 8966e59806aaaa154ca5ffbc160f5fac1b526009..8a31906bdc9b94ca153f7ea2bc811666e6b9524b 100644 (file)
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -1140,6 +1140,9 @@ static void cpu_hyp_reinit(void)
        } else {
                cpu_init_hyp_mode(NULL);
        }
+
+       if (vgic_present)
+               kvm_vgic_init_cpu_hardware();
 }
 
 static void _kvm_arch_hardware_enable(void *discard)