Subject: [PATCH] ARM: kuser: consistently use usr_ret for returning from helpers

From: [email-masked] (Dave Martin)
Date: Mon, 30 Jan 2012 16:31:54 +0000

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 <[email-masked]>
> Cc: Dave Martin <[email-masked]>
> Signed-off-by: Will Deacon <[email-masked]>

This matches the way I originally intended usr_ret to be used.

Acked-by: Dave Martin <[email-masked]>

> ---
>  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
>