Save/Restore Support: Add suspend/resume support for timers

Signed-off-by: Bruno Alvisio <bruno.alvisio@gmail.com>
Reviewed-by: Juergen Gross <jgross@suse.com>

diff --git a/arch/x86/time.c b/arch/x86/time.c
index 3658142baf5a4091fd9b130d19843da05f4aaa17..8077c80ccd3b9e3cd91a7af82bb251c1f239704b 100644 (file)
--- a/arch/x86/time.c
+++ b/arch/x86/time.c
@@ -233,7 +233,6 @@ static void timer_handler(evtchn_port_t ev, struct pt_regs *regs, void *ign)
 static evtchn_port_t port;
 void init_time(void)
 {
-    printk("Initialising timer interface\n");
     port = bind_virq(VIRQ_TIMER, &timer_handler, NULL);
     unmask_evtchn(port);
 }

diff --git a/kernel.c b/kernel.c
index 782eb79ecd41d069fb5e1d849b4c4260edd20e08..3564af33f833a5755dc805a54493c8a49a4e920a 100644 (file)
--- a/kernel.c
+++ b/kernel.c
@@ -120,10 +120,14 @@ void start_kernel(void* par)
 void pre_suspend(void)
 {
     local_irq_disable();
+
+    fini_time();
 }
 
 void post_suspend(int canceled)
 {
+    init_time();
+
     local_irq_enable();
 }