Merge branch 'master' of /home/trondmy/repositories/git/linux-2.6/

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

diff --git a/kernel/timer.c b/kernel/timer.c
index 59a28b1752f801355fccb68f5b94ca4758cf9958..5ec5490f8d85ca083d3c1525fd4789fff5f3ff70 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -92,24 +92,24 @@ static DEFINE_PER_CPU(tvec_base_t *, tvec_bases) = &boot_tvec_bases;
 /* Functions below help us manage 'deferrable' flag */
 static inline unsigned int tbase_get_deferrable(tvec_base_t *base)
 {
-       return (unsigned int)((unsigned long)base & TBASE_DEFERRABLE_FLAG);
+       return ((unsigned int)(unsigned long)base & TBASE_DEFERRABLE_FLAG);
 }
 
 static inline tvec_base_t *tbase_get_base(tvec_base_t *base)
 {
-       return (tvec_base_t *)((unsigned long)base & ~TBASE_DEFERRABLE_FLAG);
+       return ((tvec_base_t *)((unsigned long)base & ~TBASE_DEFERRABLE_FLAG));
 }
 
 static inline void timer_set_deferrable(struct timer_list *timer)
 {
-       timer->base = (tvec_base_t *)((unsigned long)timer->base |
-                                      TBASE_DEFERRABLE_FLAG);
+       timer->base = ((tvec_base_t *)((unsigned long)(timer->base) |
+                                      TBASE_DEFERRABLE_FLAG));
 }
 
 static inline void
 timer_set_base(struct timer_list *timer, tvec_base_t *new_base)
 {
-       timer->base = (tvec_base_t *)((unsigned long)new_base |
+       timer->base = (tvec_base_t *)((unsigned long)(new_base) |
                                      tbase_get_deferrable(timer->base));
 }
 
@@ -1499,8 +1499,6 @@ unregister_time_interpolator(struct time_interpolator *ti)
                prev = &curr->next;
        }
 
-       clocksource_resume();
-
        write_seqlock_irqsave(&xtime_lock, flags);
        if (ti == time_interpolator) {
                /* we lost the best time-interpolator: */