* [PATCH] ARM: kuser: consistently use usr_ret for returning from helpers
@ 2012-01-27 15:33 Will Deacon
2012-01-27 18:37 ` Nicolas Pitre
2012-01-30 16:31 ` Dave Martin
0 siblings, 2 replies; 3+ messages in thread
From: Will Deacon @ 2012-01-27 15:33 UTC (permalink / raw)
To: linux-arm-kernel
__kuser_cmpxchg64 has a return path using bx lr to get back to the caller.
This is actually ok since the code in question is predicated on
CONFIG_CPU_32v6K, but for the sake of consistency using the usr_ret
macro is probably better.
Cc: Nicolas Pitre <nico@fluxnic.net>
Cc: Dave Martin <dave.martin@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
---
arch/arm/kernel/entry-armv.S | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
index 3a456c6..be16a48 100644
--- a/arch/arm/kernel/entry-armv.S
+++ b/arch/arm/kernel/entry-armv.S
@@ -790,7 +790,7 @@ __kuser_cmpxchg64: @ 0xffff0f60
smp_dmb arm
rsbs r0, r3, #0 @ set returned val and C flag
ldmfd sp!, {r4, r5, r6, r7}
- bx lr
+ usr_ret lr
#elif !defined(CONFIG_SMP)
--
1.7.4.1
^ permalink raw reply related [flat|nested] 3+ messages in thread* [PATCH] ARM: kuser: consistently use usr_ret for returning from helpers
2012-01-27 15:33 [PATCH] ARM: kuser: consistently use usr_ret for returning from helpers Will Deacon
@ 2012-01-27 18:37 ` Nicolas Pitre
2012-01-30 16:31 ` Dave Martin
1 sibling, 0 replies; 3+ messages in thread
From: Nicolas Pitre @ 2012-01-27 18:37 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, 27 Jan 2012, Will Deacon wrote:
> __kuser_cmpxchg64 has a return path using bx lr to get back to the caller.
> This is actually ok since the code in question is predicated on
> CONFIG_CPU_32v6K, but for the sake of consistency using the usr_ret
> macro is probably better.
Indeed.
> Cc: Nicolas Pitre <nico@fluxnic.net>
> Cc: Dave Martin <dave.martin@linaro.org>
> Signed-off-by: Will Deacon <will.deacon@arm.com>
Acked-by: Nicolas Pitre <nico@linaro.org>
> ---
> arch/arm/kernel/entry-armv.S | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
> index 3a456c6..be16a48 100644
> --- a/arch/arm/kernel/entry-armv.S
> +++ b/arch/arm/kernel/entry-armv.S
> @@ -790,7 +790,7 @@ __kuser_cmpxchg64: @ 0xffff0f60
> smp_dmb arm
> rsbs r0, r3, #0 @ set returned val and C flag
> ldmfd sp!, {r4, r5, r6, r7}
> - bx lr
> + usr_ret lr
>
> #elif !defined(CONFIG_SMP)
>
> --
> 1.7.4.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread* [PATCH] ARM: kuser: consistently use usr_ret for returning from helpers
2012-01-27 15:33 [PATCH] ARM: kuser: consistently use usr_ret for returning from helpers Will Deacon
2012-01-27 18:37 ` Nicolas Pitre
@ 2012-01-30 16:31 ` Dave Martin
1 sibling, 0 replies; 3+ messages in thread
From: Dave Martin @ 2012-01-30 16:31 UTC (permalink / raw)
To: linux-arm-kernel
On Fri, Jan 27, 2012 at 03:33:52PM +0000, Will Deacon wrote:
> __kuser_cmpxchg64 has a return path using bx lr to get back to the caller.
> This is actually ok since the code in question is predicated on
> CONFIG_CPU_32v6K, but for the sake of consistency using the usr_ret
> macro is probably better.
>
> Cc: Nicolas Pitre <nico@fluxnic.net>
> Cc: Dave Martin <dave.martin@linaro.org>
> Signed-off-by: Will Deacon <will.deacon@arm.com>
This matches the way I originally intended usr_ret to be used.
Acked-by: Dave Martin <dave.martin@linaro.org>
> ---
> arch/arm/kernel/entry-armv.S | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S
> index 3a456c6..be16a48 100644
> --- a/arch/arm/kernel/entry-armv.S
> +++ b/arch/arm/kernel/entry-armv.S
> @@ -790,7 +790,7 @@ __kuser_cmpxchg64: @ 0xffff0f60
> smp_dmb arm
> rsbs r0, r3, #0 @ set returned val and C flag
> ldmfd sp!, {r4, r5, r6, r7}
> - bx lr
> + usr_ret lr
>
> #elif !defined(CONFIG_SMP)
>
> --
> 1.7.4.1
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-01-30 16:31 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-01-27 15:33 [PATCH] ARM: kuser: consistently use usr_ret for returning from helpers Will Deacon
2012-01-27 18:37 ` Nicolas Pitre
2012-01-30 16:31 ` Dave Martin
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).