---

yaml
---
r: 99567
b: refs/heads/master
c: d07af1f
h: refs/heads/master
i:
  99565: 55b4e50
  99563: c7ca755
  99559: 135e880
  99551: d6ee163
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9c7a794209f8a91f47697c3be20597eb60531e6d
+refs/heads/master: d07af1f0e3a3e378074fc36322dd7b0e72d9a3e2

trunk/arch/x86/xen/suspend.c

@@ -38,6 +38,7 @@ void xen_post_suspend(int suspend_cancelled)
 		xen_cpu_initialized_map = cpu_online_map;
 #endif
 		xen_vcpu_restore();
+		xen_timer_resume();
 	}
 
 }

trunk/arch/x86/xen/time.c

@@ -572,6 +572,19 @@ void xen_setup_cpu_clockevents(void)
 	clockevents_register_device(&__get_cpu_var(xen_clock_events));
 }
 
+void xen_timer_resume(void)
+{
+	int cpu;
+
+	if (xen_clockevent != &xen_vcpuop_clockevent)
+		return;
+
+	for_each_online_cpu(cpu) {
+		if (HYPERVISOR_vcpu_op(VCPUOP_stop_periodic_timer, cpu, NULL))
+			BUG();
+	}
+}
+
 __init void xen_time_init(void)
 {
 	int cpu = smp_processor_id();

trunk/arch/x86/xen/xen-ops.h

@@ -37,6 +37,7 @@ void __init xen_time_init(void);
 unsigned long xen_get_wallclock(void);
 int xen_set_wallclock(unsigned long time);
 unsigned long long xen_sched_clock(void);
+void xen_timer_resume(void);
 
 irqreturn_t xen_debug_interrupt(int irq, void *dev_id);