diff options
Diffstat (limited to 'arch/x86')
-rw-r--r-- | arch/x86/xen/suspend.c | 5 | ||||
-rw-r--r-- | arch/x86/xen/xen-ops.h | 1 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/x86/xen/suspend.c b/arch/x86/xen/suspend.c index 251669a932d4..2a234db5949b 100644 --- a/arch/x86/xen/suspend.c +++ b/arch/x86/xen/suspend.c | |||
@@ -38,8 +38,11 @@ void xen_post_suspend(int suspend_cancelled) | |||
38 | xen_cpu_initialized_map = cpu_online_map; | 38 | xen_cpu_initialized_map = cpu_online_map; |
39 | #endif | 39 | #endif |
40 | xen_vcpu_restore(); | 40 | xen_vcpu_restore(); |
41 | xen_timer_resume(); | ||
42 | } | 41 | } |
43 | 42 | ||
44 | } | 43 | } |
45 | 44 | ||
45 | void xen_arch_resume(void) | ||
46 | { | ||
47 | /* nothing */ | ||
48 | } | ||
diff --git a/arch/x86/xen/xen-ops.h b/arch/x86/xen/xen-ops.h index 6f4b1045c1c2..77354d204257 100644 --- a/arch/x86/xen/xen-ops.h +++ b/arch/x86/xen/xen-ops.h | |||
@@ -37,7 +37,6 @@ void __init xen_time_init(void); | |||
37 | unsigned long xen_get_wallclock(void); | 37 | unsigned long xen_get_wallclock(void); |
38 | int xen_set_wallclock(unsigned long time); | 38 | int xen_set_wallclock(unsigned long time); |
39 | unsigned long long xen_sched_clock(void); | 39 | unsigned long long xen_sched_clock(void); |
40 | void xen_timer_resume(void); | ||
41 | 40 | ||
42 | irqreturn_t xen_debug_interrupt(int irq, void *dev_id); | 41 | irqreturn_t xen_debug_interrupt(int irq, void *dev_id); |
43 | 42 | ||