X-Git-Url: http://pileus.org/git/?a=blobdiff_plain;f=arch%2Farm%2Fkvm%2Farm.c;h=bd18bb8b2770ced6a65e5b3ad50dd79963d49c3b;hb=e1aa17c7b52c2cc1a4c20f62deadcd94ce8b632c;hp=1d8248ea5669fa81209b2a7a8a055b7855a8c1f3;hpb=895be5b31e5175bef575008aadb4f0a27b850daa;p=~andy%2Flinux

diff --git a/arch/arm/kvm/arm.c b/arch/arm/kvm/arm.c
index 1d8248ea566..bd18bb8b277 100644
--- a/arch/arm/kvm/arm.c
+++ b/arch/arm/kvm/arm.c
@@ -878,7 +878,8 @@ static int hyp_init_cpu_pm_notifier(struct notifier_block *self,
 				    unsigned long cmd,
 				    void *v)
 {
-	if (cmd == CPU_PM_EXIT) {
+	if (cmd == CPU_PM_EXIT &&
+	    __hyp_get_vectors() == hyp_default_vectors) {
 		cpu_init_hyp_mode(NULL);
 		return NOTIFY_OK;
 	}