summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJon Hunter <jon-hunter@ti.com>2009-05-01 13:10:23 -0700
committerThomas Gleixner <tglx@linutronix.de>2009-05-02 10:36:06 +0200
commita04198887658e1d8ae25f5420035c057cb170e67 (patch)
treed6ed8b34265937f40bfec1bccec31ab86f6ac753
parent091438dd5668396328a3419abcbc6591159eb8d1 (diff)
timers: allow deferrable timers for intervals tv2-tv5 to be deferred
In the current kernel implementation only kernel timers for time interval tv1 are being deferred. This patch allows any timer that is configured as deferrable to be defer regardless of time interval. This patch was previously discussed in http://marc.info/?l=linux-kernel&m=123196343531966&w=2 and was acked by Venki Pallipadi, the author of the original deferrable timer patch. Signed-off-by: Jon Hunter <jon-hunter@ti.com> Acked-by: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--kernel/timer.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/kernel/timer.c b/kernel/timer.c
index cffffad01c3..5c1e84beaf4 100644
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1015,6 +1015,9 @@ cascade:
index = slot = timer_jiffies & TVN_MASK;
do {
list_for_each_entry(nte, varp->vec + slot, entry) {
+ if (tbase_get_deferrable(nte->base))
+ continue;
+
found = 1;
if (time_before(nte->expires, expires))
expires = nte->expires;