Commit 38edbb0b authored by Viresh Kumar's avatar Viresh Kumar Committed by Thomas Gleixner

timer: Make sure TIMER_FLAG_MASK bits are free in allocated base

Currently we are using two lowest bit of base for internal purpose and
so they both should be zero in the allocated address. The code was
doing the right thing before this patch came in: commit c5f66e99
(timer: Implement TIMER_IRQSAFE)

Tejun probably forgot to update this piece of code which checks if the
lowest 'n' bits are zero or not and so wasn't updated according to the
new flag. Lets use TIMER_FLAG_MASK in the calculations here.

[ tglx: Massaged changelog ]
Signed-off-by: default avatarViresh Kumar <viresh.kumar@linaro.org>
Cc: linaro-kernel@lists.linaro.org
Cc: fweisbec@gmail.com
Cc: tj@kernel.org
Cc: peterz@infradead.org
Link: http://lkml.kernel.org/r/9144e10d7e854a0aa8a673332adec356d81a923c.1393576981.git.viresh.kumar@linaro.orgSigned-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent c24a4a36
...@@ -1555,9 +1555,8 @@ static int init_timers_cpu(int cpu) ...@@ -1555,9 +1555,8 @@ static int init_timers_cpu(int cpu)
if (!base) if (!base)
return -ENOMEM; return -ENOMEM;
/* Make sure that tvec_base is 2 byte aligned */ /* Make sure tvec_base has TIMER_FLAG_MASK bits free */
if (tbase_get_deferrable(base)) { if (WARN_ON(base != tbase_get_base(base))) {
WARN_ON(1);
kfree(base); kfree(base);
return -ENOMEM; return -ENOMEM;
} }
......
Markdown is supported
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