[PATCH] clockevents: Fix suspend/resume to disk hangs

[linux-2.6] / kernel / time / tick-oneshot.c

diff --git a/kernel/time/tick-oneshot.c b/kernel/time/tick-oneshot.c
index 2e8b7ff863cc3396387e0e6b790074d5b53ad381..f6997ab0c3c9c1101c9df8c9bd433e4126cc4a40 100644 (file)
--- a/kernel/time/tick-oneshot.c
+++ b/kernel/time/tick-oneshot.c
@@ -40,6 +40,18 @@ int tick_program_event(ktime_t expires, int force)
        }
 }
 
+/**
+ * tick_resume_onshot - resume oneshot mode
+ */
+void tick_resume_oneshot(void)
+{
+       struct tick_device *td = &__get_cpu_var(tick_cpu_device);
+       struct clock_event_device *dev = td->evtdev;
+
+       clockevents_set_mode(dev, CLOCK_EVT_MODE_ONESHOT);
+       tick_program_event(ktime_get(), 1);
+}
+
 /**
  * tick_setup_oneshot - setup the event device for oneshot mode (hres or nohz)
  */