---

yaml --- r: 362752 b: refs/heads/master c: 888b65b h: refs/heads/master v: v3
git-mirror · Apr 16, 2013 · 5208c60 · 5208c60
1 parent 9fc882b
commit 5208c60
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 36c1132e34bda9605ff89648f085abaddf83cf3d
+refs/heads/master: 888b65b4bc5e7fcbbb967023300cd5d44dba1950
diff --git a/trunk/arch/x86/xen/smp.c b/trunk/arch/x86/xen/smp.c
@@ -662,6 +662,7 @@ static void xen_hvm_cpu_die(unsigned int cpu)
 	unbind_from_irqhandler(per_cpu(xen_debug_irq, cpu), NULL);
 	unbind_from_irqhandler(per_cpu(xen_callfuncsingle_irq, cpu), NULL);
 	unbind_from_irqhandler(per_cpu(xen_irq_work, cpu), NULL);
+	xen_teardown_timer(cpu);
 	native_cpu_die(cpu);
 }