mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 10:40:03 +01:00
Ian Campbell
3bd852f207
No changes required to sparse tree or patches directory. Signed-off-by: Ian Campbell <ian.campbell@xensource.com>
27 lines
963 B
Diff
27 lines
963 B
Diff
diff -pruN ../orig-linux-2.6.16.29/kernel/timer.c ./kernel/timer.c
|
|
--- ../orig-linux-2.6.16.29/kernel/timer.c 2006-09-12 19:02:10.000000000 +0100
|
|
+++ ./kernel/timer.c 2006-09-19 13:58:58.000000000 +0100
|
|
@@ -555,6 +555,22 @@ found:
|
|
}
|
|
spin_unlock(&base->t_base.lock);
|
|
|
|
+ /*
|
|
+ * It can happen that other CPUs service timer IRQs and increment
|
|
+ * jiffies, but we have not yet got a local timer tick to process
|
|
+ * the timer wheels. In that case, the expiry time can be before
|
|
+ * jiffies, but since the high-resolution timer here is relative to
|
|
+ * jiffies, the default expression when high-resolution timers are
|
|
+ * not active,
|
|
+ *
|
|
+ * time_before(MAX_JIFFY_OFFSET + jiffies, expires)
|
|
+ *
|
|
+ * would falsely evaluate to true. If that is the case, just
|
|
+ * return jiffies so that we can immediately fire the local timer
|
|
+ */
|
|
+ if (time_before(expires, jiffies))
|
|
+ return jiffies;
|
|
+
|
|
if (time_before(hr_expires, expires))
|
|
return hr_expires;
|
|
|