summaryrefslogtreecommitdiffstats
path: root/arch/x86/xen/time.c
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2010-12-17 15:16:46 +0100
committerTejun Heo <tj@kernel.org>2010-12-17 15:16:46 +0100
commit275c8b93288ef0c2281e414e069ea8ed4bad03f7 (patch)
treedf906ef901d7719d66944921c7436f5db718dc2f /arch/x86/xen/time.c
parentcore: Replace __get_cpu_var with __this_cpu_read if not used for an address. (diff)
parentx86: Support for this_cpu_add, sub, dec, inc_return (diff)
downloadlinux-275c8b93288ef0c2281e414e069ea8ed4bad03f7.tar.xz
linux-275c8b93288ef0c2281e414e069ea8ed4bad03f7.zip
Merge branch 'this_cpu_ops' into for-2.6.38
Diffstat (limited to 'arch/x86/xen/time.c')
-rw-r--r--arch/x86/xen/time.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c
index ef8930f51b09..067759e3d6a5 100644
--- 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;