diff options
| author | Neil Zhang <zhangwm@marvell.com> | 2014-01-13 03:57:56 -0500 |
|---|---|---|
| committer | Catalin Marinas <catalin.marinas@arm.com> | 2014-01-13 08:55:13 -0500 |
| commit | 883c057367014d20a14b5054e4eb0d81ce3bea5c (patch) | |
| tree | 5f9ba970f934ec366dbec78950bf479a56c58f58 /arch/arm64 | |
| parent | 65c021bb496a46ec06264e9d5e836dffa70ef380 (diff) | |
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.S | 2 |
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: | |||
| 316 | 316 | ||
| 317 | #ifdef CONFIG_PREEMPT | 317 | #ifdef CONFIG_PREEMPT |
| 318 | get_thread_info tsk | 318 | get_thread_info tsk |
| 319 | ldr w24, [tsk, #TI_PREEMPT] // restore preempt count | 319 | ldr w24, [tsk, #TI_PREEMPT] // get preempt count |
| 320 | cbnz w24, 1f // preempt count != 0 | 320 | cbnz w24, 1f // preempt count != 0 |
| 321 | ldr x0, [tsk, #TI_FLAGS] // get flags | 321 | ldr x0, [tsk, #TI_FLAGS] // get flags |
| 322 | tbz x0, #TIF_NEED_RESCHED, 1f // needs rescheduling? | 322 | tbz x0, #TIF_NEED_RESCHED, 1f // needs rescheduling? |