Commit-ID: 38edbb0b913d73713c23dcc742669f7e78b52aa7 Gitweb: http://git.kernel.org/tip/38edbb0b913d73713c23dcc742669f7e78b52aa7 Author: Viresh Kumar <viresh.ku...@linaro.org> AuthorDate: Fri, 28 Feb 2014 14:15:22 +0530 Committer: Thomas Gleixner <t...@linutronix.de> CommitDate: Tue, 4 Mar 2014 12:30:29 +0100
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 c5f66e99b (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: Viresh Kumar <viresh.ku...@linaro.org> Cc: linaro-ker...@lists.linaro.org Cc: fweis...@gmail.com Cc: t...@kernel.org Cc: pet...@infradead.org Link: http://lkml.kernel.org/r/9144e10d7e854a0aa8a673332adec356d81a923c.1393576981.git.viresh.ku...@linaro.org Signed-off-by: Thomas Gleixner <t...@linutronix.de> --- kernel/timer.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/kernel/timer.c b/kernel/timer.c index 31824ef..949d74e 100644 --- a/kernel/timer.c +++ b/kernel/timer.c @@ -1555,9 +1555,8 @@ static int init_timers_cpu(int cpu) if (!base) return -ENOMEM; - /* Make sure that tvec_base is 2 byte aligned */ - if (tbase_get_deferrable(base)) { - WARN_ON(1); + /* Make sure tvec_base has TIMER_FLAG_MASK bits free */ + if (WARN_ON(base != tbase_get_base(base))) { kfree(base); return -ENOMEM; } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
