[PATCH] another timer overflow thing

in add_timer_internal() we simply leave the timer pending forever if the
expiry is in more than 0xffffffff jiffies. This means more than 48 days on
eg. ia64 - which is not an unrealistic timeout. IIRC crond is happy to use
extremely large timeouts.

It's better to time out early (if you can call 48 days "early") than to
not time out at all.

diff --git a/kernel/timer.c b/kernel/timer.c
index 7bce7a7cb2c299c5b8db5b81d92256a443aa138e..3995425e44a500f03b8b0dbb957a0560f008b33e 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -126,13 +126,17 @@ static void internal_add_timer(tvec_base_t *base, struct timer_list *timer)
                 * or you set a timer to go off in the past
                 */
                vec = base->tv1.vec + (base->timer_jiffies & TVR_MASK);
-       } else if (idx <= 0xffffffffUL) {
-               int i = (expires >> (TVR_BITS + 3 * TVN_BITS)) & TVN_MASK;
-               vec = base->tv5.vec + i;
        } else {
-               /* Can only get here on architectures with 64-bit jiffies */
-               INIT_LIST_HEAD(&timer->entry);
-               return;
+               int i;
+               /* If the timeout is larger than 0xffffffff on 64-bit
+                * architectures then we use the maximum timeout:
+                */
+               if (idx > 0xffffffffUL) {
+                       idx = 0xffffffffUL;
+                       expires = idx + base->timer_jiffies;
+               }
+               i = (expires >> (TVR_BITS + 3 * TVN_BITS)) & TVN_MASK;
+               vec = base->tv5.vec + i;
        }
        /*
         * Timers are FIFO: