From a82703b14dfbd832e3ed892583375b2e63727f65 Mon Sep 17 00:00:00 2001 From: Avi Kivity Date: Sun, 11 Nov 2007 18:37:32 +0200 Subject: [PATCH] --- yaml --- r: 80715 b: refs/heads/master c: 1a6f4d7fbd11e539630cd5637311a4e55fae60ef h: refs/heads/master i: 80713: 836685fe61d4224dcf90b34b71770ffa48ba011c 80711: 8f0494c08043543fc01e4f71d0be6955e4a5d8af v: v3 --- [refs] | 2 +- trunk/drivers/kvm/kvm_main.c | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index fbb59bfedcfe..ec7b69c0b1d0 100644 --- 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 index 8d6e55f95fbb..d395c987894e 100644 --- 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);