update hdmi driver: support 480p

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

diff --git a/kernel/timer.c b/kernel/timer.c
index 5db5a8d2681168cfcf9c571d2da69629245c92ba..cb3c1f19a2f6f001952cca2cb32cc69c45298820 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1173,6 +1173,12 @@ unsigned long get_next_timer_interrupt(unsigned long now)
        struct tvec_base *base = __get_cpu_var(tvec_bases);
        unsigned long expires;
 
+       /*
+        * Pretend that there is no timer pending if the cpu is offline.
+        * Possible pending timers will be migrated later to an active cpu.
+        */
+       if (cpu_is_offline(smp_processor_id()))
+               return now + NEXT_TIMER_MAX_DELTA;
        spin_lock(&base->lock);
        if (time_before_eq(base->next_timer, base->timer_jiffies))
                base->next_timer = __next_timer_interrupt(base);