Commit e9910846 authored by's avatar Committed by Linus Torvalds
Browse files

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" <>
Cc: Satyam Sharma <>
Cc: Oleg Nesterov <>
Signed-off-by: default avatarJarek Poplawski <>
Signed-off-by: default avatarAndrew Morton <>
Signed-off-by: default avatarLinus Torvalds <>
parent c91e23c6
......@@ -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 |
timer->base = ((tvec_base_t *)((unsigned long)(timer->base) |
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) |
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment