diff options
| -rw-r--r-- | kernel/timer.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 59a28b1752f8..a6c580ac084b 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
| @@ -92,24 +92,24 @@ static DEFINE_PER_CPU(tvec_base_t *, tvec_bases) = &boot_tvec_bases; | |||
| 92 | /* Functions below help us manage 'deferrable' flag */ | 92 | /* Functions below help us manage 'deferrable' flag */ |
| 93 | static inline unsigned int tbase_get_deferrable(tvec_base_t *base) | 93 | static inline unsigned int tbase_get_deferrable(tvec_base_t *base) |
| 94 | { | 94 | { |
| 95 | return (unsigned int)((unsigned long)base & TBASE_DEFERRABLE_FLAG); | 95 | return ((unsigned int)(unsigned long)base & TBASE_DEFERRABLE_FLAG); |
| 96 | } | 96 | } |
| 97 | 97 | ||
| 98 | static inline tvec_base_t *tbase_get_base(tvec_base_t *base) | 98 | static inline tvec_base_t *tbase_get_base(tvec_base_t *base) |
| 99 | { | 99 | { |
| 100 | return (tvec_base_t *)((unsigned long)base & ~TBASE_DEFERRABLE_FLAG); | 100 | return ((tvec_base_t *)((unsigned long)base & ~TBASE_DEFERRABLE_FLAG)); |
| 101 | } | 101 | } |
| 102 | 102 | ||
| 103 | static inline void timer_set_deferrable(struct timer_list *timer) | 103 | static inline void timer_set_deferrable(struct timer_list *timer) |
| 104 | { | 104 | { |
| 105 | timer->base = (tvec_base_t *)((unsigned long)timer->base | | 105 | timer->base = ((tvec_base_t *)((unsigned long)(timer->base) | |
| 106 | TBASE_DEFERRABLE_FLAG); | 106 | TBASE_DEFERRABLE_FLAG)); |
| 107 | } | 107 | } |
| 108 | 108 | ||
| 109 | static inline void | 109 | static inline void |
| 110 | timer_set_base(struct timer_list *timer, tvec_base_t *new_base) | 110 | timer_set_base(struct timer_list *timer, tvec_base_t *new_base) |
| 111 | { | 111 | { |
| 112 | timer->base = (tvec_base_t *)((unsigned long)new_base | | 112 | timer->base = (tvec_base_t *)((unsigned long)(new_base) | |
| 113 | tbase_get_deferrable(timer->base)); | 113 | tbase_get_deferrable(timer->base)); |
| 114 | } | 114 | } |
| 115 | 115 | ||
