On Mon, Jan 13, 2014 at 08:57:56AM +0000, Neil Zhang wrote: > Commit 64681787 (arm64: let the core code deal with preempt_count) > changed the code, but left the comments unchanged, fix it. > > Signed-off-by: Neil Zhang <zhan...@marvell.com> > --- > arch/arm64/kernel/entry.S | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S > index 4d2c6f3..ffce55e 100644 > --- a/arch/arm64/kernel/entry.S > +++ b/arch/arm64/kernel/entry.S > @@ -314,7 +314,7 @@ el1_irq: > > #ifdef CONFIG_PREEMPT > get_thread_info tsk > - ldr w24, [tsk, #TI_PREEMPT] // restore preempt count > + ldr w24, [tsk, #TI_PREEMPT] // get preempt count > cbnz w24, 1f // preempt count != 0 > ldr x0, [tsk, #TI_FLAGS] // get flags > tbz x0, #TIF_NEED_RESCHED, 1f // needs rescheduling?
Makes sense: Acked-by: Will Deacon <will.dea...@arm.com> Will -- 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/
