diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-09 20:22:04 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-12-09 20:22:04 +0000 |
| commit | 8d5203ca62539c6ab36a5bc2402c2de1de460e30 (patch) | |
| tree | dd0c5815cea7134904855bef8d81a9b31e45c06b /arch/x86/xen/time.c | |
| parent | 8fd2685911cb6c140e6d0588ac04990ce65d4537 (diff) | |
| parent | 63abf3edaf42d0b9f278df90fe41c7ed4796b6b1 (diff) | |
| download | kernel_goldelico_gta04-8d5203ca62539c6ab36a5bc2402c2de1de460e30.zip kernel_goldelico_gta04-8d5203ca62539c6ab36a5bc2402c2de1de460e30.tar.gz kernel_goldelico_gta04-8d5203ca62539c6ab36a5bc2402c2de1de460e30.tar.bz2 | |
Merge branch 'drm-intel-fixes' into drm-intel-next
Diffstat (limited to 'arch/x86/xen/time.c')
| -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 b2bb5aa..5da5e53 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; |