summaryrefslogtreecommitdiffstats
path: root/arch/arm64
diff options
context:
space:
mode:
authorNeil Zhang <zhangwm@marvell.com>2014-01-13 08:57:56 +0000
committerCatalin Marinas <catalin.marinas@arm.com>2014-01-13 13:55:13 +0000
commit883c057367014d20a14b5054e4eb0d81ce3bea5c (patch)
tree5f9ba970f934ec366dbec78950bf479a56c58f58 /arch/arm64
parent65c021bb496a46ec06264e9d5e836dffa70ef380 (diff)
downloadblackbird-op-linux-883c057367014d20a14b5054e4eb0d81ce3bea5c.tar.gz
blackbird-op-linux-883c057367014d20a14b5054e4eb0d81ce3bea5c.zip
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 <zhangwm@marvell.com> Acked-by: Will Deacon <will.deacon@arm.com> Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Diffstat (limited to 'arch/arm64')
-rw-r--r--arch/arm64/kernel/entry.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 32d7fe6c3d6a..39ac630d83de 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?
OpenPOWER on IntegriCloud