From: Neil Zhang Date: Mon, 13 Jan 2014 08:57:56 +0000 (+0000) Subject: arm64: fix typo in entry.S X-Git-Tag: v3.14-rc1~18^2~8 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=883c057367014d20a14b5054e4eb0d81ce3bea5c;p=platform%2Fkernel%2Flinux-stable.git arm64: fix typo in entry.S 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 Acked-by: Will Deacon Signed-off-by: Catalin Marinas --- diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 32d7fe6..39ac630 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -316,7 +316,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?