* [PATCH] arm64: fix typo in entry.S
@ 2014-01-13 8:57 Neil Zhang
2014-01-13 11:11 ` Will Deacon
0 siblings, 1 reply; 2+ messages in thread
From: Neil Zhang @ 2014-01-13 8:57 UTC (permalink / raw)
To: catalin.marinas, will.deacon, linux-arm-kernel, linux-kernel
Cc: marc.zyngier, Neil Zhang
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>
---
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?
--
1.7.9.5
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PATCH] arm64: fix typo in entry.S
2014-01-13 8:57 [PATCH] arm64: fix typo in entry.S Neil Zhang
@ 2014-01-13 11:11 ` Will Deacon
0 siblings, 0 replies; 2+ messages in thread
From: Will Deacon @ 2014-01-13 11:11 UTC (permalink / raw)
To: Neil Zhang; +Cc: Catalin Marinas, linux-arm-kernel, linux-kernel, Marc Zyngier
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 <zhangwm@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.deacon@arm.com>
Will
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2014-01-13 11:12 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-13 8:57 [PATCH] arm64: fix typo in entry.S Neil Zhang
2014-01-13 11:11 ` Will Deacon
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®