Merge branch 'this_cpu_ops' into for-2.6.38

2010-12-17 15:16:46 +01:00
parent 909ea96468 8f1d97c79e
commit 275c8b9328
369 changed files with 3788 additions and 2085 deletions
--- a/arch/x86/xen/time.c
+++ b/arch/x86/xen/time.c
@@ -426,6 +426,8 @@ void xen_timer_resume(void)
 {
 	int cpu;

+	pvclock_resume();
+
 	if (xen_clockevent != &xen_vcpuop_clockevent)
 		return;