KVM: ARM: Call hyp_cpu_pm_exit at the right place

[sfrench/cifs-2.6.git] / virt / kvm / arm / arm.c

diff --git a/virt/kvm/arm/arm.c b/virt/kvm/arm/arm.c
index 8de4daf25097d9267cf097d3be879f4372e3ff6a..b5d57ed6443ceeb283817bbf63f6f532fb984745 100644 (file)
--- a/virt/kvm/arm/arm.c
+++ b/virt/kvm/arm/arm.c
@@ -1537,7 +1537,6 @@ static void teardown_hyp_mode(void)
        free_hyp_pgds();
        for_each_possible_cpu(cpu)
                free_page(per_cpu(kvm_arm_hyp_stack_page, cpu));
-       hyp_cpu_pm_exit();
 }
 
 /**
@@ -1751,6 +1750,7 @@ int kvm_arch_init(void *opaque)
        return 0;
 
 out_hyp:
+       hyp_cpu_pm_exit();
        if (!in_hyp_mode)
                teardown_hyp_mode();
 out_err: