Merge branches 'pm-cpuidle' and 'pm-qos'

[sfrench/cifs-2.6.git] / kernel / time / tick-sched.c

diff --git a/kernel/time/tick-sched.c b/kernel/time/tick-sched.c
index e35a6fced00ca44943d479ff0c0065370b147c86..646645e981f942480d49857fc84ef2d5bcd14791 100644 (file)
--- a/kernel/time/tick-sched.c
+++ b/kernel/time/tick-sched.c
@@ -51,6 +51,15 @@ struct tick_sched *tick_get_tick_sched(int cpu)
  */
 static ktime_t last_jiffies_update;
 
+/*
+ * Called after resume. Make sure that jiffies are not fast forwarded due to
+ * clock monotonic being forwarded by the suspended time.
+ */
+void tick_sched_forward_next_period(void)
+{
+       last_jiffies_update = tick_next_period;
+}
+
 /*
  * Must be called with interrupts disabled !
  */