diff --git a/[refs] b/[refs] index f28f3bac459b..7fd7c81552fc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 76edc6051e02186fe664ab880447e2d1f96fd884 +refs/heads/master: 53f087febfd12e74ba9f1082e71e9a45adc039ad diff --git a/trunk/kernel/timer.c b/trunk/kernel/timer.c index 4f1cb0ab5251..b9dad3994676 100644 --- a/trunk/kernel/timer.c +++ b/trunk/kernel/timer.c @@ -495,7 +495,7 @@ unsigned long next_timer_interrupt(void) base = &__get_cpu_var(tvec_bases); spin_lock(&base->t_base.lock); expires = base->timer_jiffies + (LONG_MAX >> 1); - list = 0; + list = NULL; /* Look for timer events in tv1. */ j = base->timer_jiffies & TVR_MASK;