Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

[firefly-linux-kernel-4.4.55.git] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index 4f1cb0ab5251aed2b690003527a26258e15c49a0..b9dad3994676948f114e757a59f18c29f950e5f7 100644 (file)
--- a/kernel/timer.c
+++ b/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;