---

yaml --- r: 80715 b: refs/heads/master c: 1a6f4d7 h: refs/heads/master i: 80713: 836685f 80711: 8f0494c v: v3
git-mirror · Jan 30, 2008 · a82703b · a82703b
1 parent 5a0dfbc
commit a82703b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 906e608b05b87b650e509491e41c89575358df5e
+refs/heads/master: 1a6f4d7fbd11e539630cd5637311a4e55fae60ef
diff --git a/trunk/drivers/kvm/kvm_main.c b/trunk/drivers/kvm/kvm_main.c
@@ -1335,21 +1335,19 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val,
 {
 	int cpu = (long)v;
 
+	val &= ~CPU_TASKS_FROZEN;
 	switch (val) {
 	case CPU_DYING:
-	case CPU_DYING_FROZEN:
 		printk(KERN_INFO "kvm: disabling virtualization on CPU%d\n",
 		       cpu);
 		hardware_disable(NULL);
 		break;
 	case CPU_UP_CANCELED:
-	case CPU_UP_CANCELED_FROZEN:
 		printk(KERN_INFO "kvm: disabling virtualization on CPU%d\n",
 		       cpu);
 		smp_call_function_single(cpu, hardware_disable, NULL, 0, 1);
 		break;
 	case CPU_ONLINE:
-	case CPU_ONLINE_FROZEN:
 		printk(KERN_INFO "kvm: enabling virtualization on CPU%d\n",
 		       cpu);
 		smp_call_function_single(cpu, hardware_enable, NULL, 0, 1);