X-Git-Url: http://pilppa.org/gitweb/?a=blobdiff_plain;f=kernel%2Fhrtimer.c;h=1b3033105b40ed0896cc7658c1cfeb9b8885a73e;hb=70ae77f497a57b3ef6b0987b6310327264517cb0;hp=067ba2c0532805f8e9e3e753eba456d6a7cbf1b9;hpb=2ba302c633754520c990a8c1d161ff304eda6002;p=linux-2.6-omap-h63xx.git

diff --git a/kernel/hrtimer.c b/kernel/hrtimer.c
index 067ba2c0532..1b3033105b4 100644
--- a/kernel/hrtimer.c
+++ b/kernel/hrtimer.c
@@ -59,6 +59,7 @@ ktime_t ktime_get(void)
 
 	return timespec_to_ktime(now);
 }
+EXPORT_SYMBOL_GPL(ktime_get);
 
 /**
  * ktime_get_real - get the real (wall-) time in ktime_t format
@@ -278,6 +279,8 @@ ktime_t ktime_add_ns(const ktime_t kt, u64 nsec)
 
 	return ktime_add(kt, tmp);
 }
+
+EXPORT_SYMBOL_GPL(ktime_add_ns);
 # endif /* !CONFIG_KTIME_SCALAR */
 
 /*
@@ -458,6 +461,18 @@ void clock_was_set(void)
 	on_each_cpu(retrigger_next_event, NULL, 0, 1);
 }
 
+/*
+ * During resume we might have to reprogram the high resolution timer
+ * interrupt (on the local CPU):
+ */
+void hres_timers_resume(void)
+{
+	WARN_ON_ONCE(num_online_cpus() > 1);
+
+	/* Retrigger the CPU local events: */
+	retrigger_next_event(NULL);
+}
+
 /*
  * Check, whether the timer is on the callback pending list
  */