Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit e9910846fdb19f7c5810cbe4c95e4ca6dab6a00f

Authored by akpm@linux-foundation.org
Committed by Linus Torvalds
1 parent c91e23c63f

timer: revert parenthesis fix in tbase_get_deferrable() etc 

On 09-05-2007 21:10, Pallipadi, Venkatesh wrote:
...
> On a 64 bit system, converting pointer to int causes unnecessary
> compiler warning, and intermediate long conversion was to avoid that.
> I will have to rephrase my comment to remove 32 bit value and use int,
> as that is what the function returns.

So, this patch reverts all changes done by my previous patch.

I apologize for my wrong comment about "logical error" here.

Cc: "Pallipadi, Venkatesh" <venkatesh.pallipadi@intel.com>
Cc: Satyam Sharma <satyam.sharma@gmail.com>
Cc: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Jarek Poplawski <jarkao2@o2.pl>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff

... ... @@ -92,24 +92,24 @@
92 92 /* Functions below help us manage 'deferrable' flag */
93 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 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 103 static inline void timer_set_deferrable(struct timer_list *timer)
104 104 {
105   - timer->base = (tvec_base_t *)((unsigned long)timer->base |
106   - TBASE_DEFERRABLE_FLAG);
  105 + timer->base = ((tvec_base_t *)((unsigned long)(timer->base) |
  106 + TBASE_DEFERRABLE_FLAG));
107 107 }
108 108  
109 109 static inline void
110 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 113 tbase_get_deferrable(timer->base));
114 114 }
115 115