From 407d76d2165efb38882d50cb065851abfb057a27 Mon Sep 17 00:00:00 2001
From: Lai Jiangshan <laijs@cn.fujitsu.com>
Date: Sat, 17 Apr 2010 17:00:19 +0800
Subject: [PATCH] --- yaml --- r: 197758 b: refs/heads/master c:
 66cbff59a16017234ea6c80ecddfc17b27a83504 h: refs/heads/master v: v3

---
 [refs]                    | 2 +-
 trunk/virt/kvm/kvm_main.c | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/[refs] b/[refs]
index 90416040415b..3fd2f01a53ca 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 87bc3bf972af0585ba5415aebbc8bd09b6a2ee94
+refs/heads/master: 66cbff59a16017234ea6c80ecddfc17b27a83504
diff --git a/trunk/virt/kvm/kvm_main.c b/trunk/virt/kvm/kvm_main.c
index 4901ec5061ba..6dc940455e8b 100644
--- a/trunk/virt/kvm/kvm_main.c
+++ b/trunk/virt/kvm/kvm_main.c
@@ -1931,11 +1931,6 @@ static int kvm_cpu_hotplug(struct notifier_block *notifier, unsigned long val,
 		       cpu);
 		hardware_disable(NULL);
 		break;
-	case CPU_UP_CANCELED:
-		printk(KERN_INFO "kvm: disabling virtualization on CPU%d\n",
-		       cpu);
-		smp_call_function_single(cpu, hardware_disable, NULL, 1);
-		break;
 	case CPU_ONLINE:
 		printk(KERN_INFO "kvm: enabling virtualization on CPU%d\n",
 		       cpu);