timer: revert parenthesis fix in tbase_get_deferrable() etc (e9910846) · Commits · 戴 / test

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>

kernel/timer.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -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));
		}

Admin message