Kernel/linux-next
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git synced 2025-01-09 15:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

xen: maintain clock offset over save/restore

Browse Source 
Hook into the device model to make sure that timekeeping's resume handler
is called.  This deals with our clocksource's non-monotonicity over the
save/restore.  Explicitly call clock_has_changed() to make sure that
all the timers get retriggered properly.

Signed-off-by: Jeremy Fitzhardinge <jeremy.fitzhardinge@citrix.com>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Jeremy Fitzhardinge 2008-05-26 23:31:28 +01:00 committed by Thomas Gleixner
parent 0e91398f2a
commit 359cdd3f86
3 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/x86/xen/time.c
View File

@ -572,14 +572,6 @@ void xen_setup_cpu_clockevents(void)
clockevents_register_device(&__get_cpu_var(xen_clock_events)); clockevents_register_device(&__get_cpu_var(xen_clock_events));
} }
void xen_time_suspend(void)
{
}
void xen_time_resume(void)
{
}
__init void xen_time_init(void) __init void xen_time_init(void)
{ {
int cpu = smp_processor_id(); int cpu = smp_processor_id();

15
drivers/xen/manage.c
View File

@ -34,14 +34,21 @@ static enum shutdown_state shutting_down = SHUTDOWN_INVALID;
static int xen_suspend(void *data) static int xen_suspend(void *data)
{ {
int *cancelled = data; int *cancelled = data;
int err;
BUG_ON(!irqs_disabled()); BUG_ON(!irqs_disabled());
load_cr3(swapper_pg_dir); load_cr3(swapper_pg_dir);
err = device_power_down(PMSG_SUSPEND);
if (err) {
printk(KERN_ERR "xen_suspend: device_power_down failed: %d\n",
err);
return err;
}
xen_mm_pin_all(); xen_mm_pin_all();
gnttab_suspend(); gnttab_suspend();
xen_time_suspend();
xen_pre_suspend(); xen_pre_suspend();
/* /*
@ -52,10 +59,11 @@ static int xen_suspend(void *data)
*cancelled = HYPERVISOR_suspend(virt_to_mfn(xen_start_info)); *cancelled = HYPERVISOR_suspend(virt_to_mfn(xen_start_info));
xen_post_suspend(*cancelled); xen_post_suspend(*cancelled);
xen_time_resume();
gnttab_resume(); gnttab_resume();
xen_mm_unpin_all(); xen_mm_unpin_all();
device_power_up();
if (!*cancelled) { if (!*cancelled) {
xen_irq_resume(); xen_irq_resume();
xen_console_resume(); xen_console_resume();
@ -105,7 +113,8 @@ static void do_suspend(void)
device_resume(); device_resume();
/* Make sure timer events get retriggered on all CPUs */
clock_was_set();
out: out:
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPT
thaw_processes(); thaw_processes();

3
include/xen/xen-ops.h
View File

@ -11,7 +11,4 @@ void xen_post_suspend(int suspend_cancelled);
void xen_mm_pin_all(void); void xen_mm_pin_all(void);
void xen_mm_unpin_all(void); void xen_mm_unpin_all(void);
void xen_time_suspend(void);
void xen_time_resume(void);
#endif /* INCLUDE_XEN_OPS_H */ #endif /* INCLUDE_XEN_OPS_H */