diff options
| author | Tejun Heo <tj@kernel.org> | 2010-12-17 15:16:46 +0100 |
|---|---|---|
| committer | Tejun Heo <tj@kernel.org> | 2010-12-17 15:16:46 +0100 |
| commit | 275c8b93288ef0c2281e414e069ea8ed4bad03f7 (patch) | |
| tree | df906ef901d7719d66944921c7436f5db718dc2f /arch/x86/xen | |
| parent | 909ea96468096b07fbb41aaf69be060d92bd9271 (diff) | |
| parent | 8f1d97c79eb65de1d05799d6b81d79cd94169114 (diff) | |
| download | op-kernel-dev-275c8b93288ef0c2281e414e069ea8ed4bad03f7.zip op-kernel-dev-275c8b93288ef0c2281e414e069ea8ed4bad03f7.tar.gz | |
Merge branch 'this_cpu_ops' into for-2.6.38
Diffstat (limited to 'arch/x86/xen')
| -rw-r--r-- | arch/x86/xen/time.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/xen/time.c b/arch/x86/xen/time.c index ef8930f..067759e 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; |
