From 5208c607b3198a205f36b41fd923d391c0fa3cca Mon Sep 17 00:00:00 2001
From: Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
Date: Tue, 16 Apr 2013 13:49:26 -0400
Subject: [PATCH] --- yaml --- r: 362752 b: refs/heads/master c:
 888b65b4bc5e7fcbbb967023300cd5d44dba1950 h: refs/heads/master v: v3

---
 [refs]                   | 2 +-
 trunk/arch/x86/xen/smp.c | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 64d37c6584af..3e937b7d5b78 100644
--- 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
index 09ea61d2e02f..f80e69cc77be 100644
--- 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);
 }