ARM: 7314/1: kuser: consistently use usr_ret for returning from helpers
authorWill Deacon <will.deacon@arm.com>
Fri, 3 Feb 2012 10:08:05 +0000 (11:08 +0100)
committerRussell King <rmk+kernel@arm.linux.org.uk>
Fri, 3 Feb 2012 15:58:46 +0000 (15:58 +0000)
commit5a97d0ae5b5d78727b87965cba84194a9f1e06ce
treedb73153f836278d74882999ca2252bdc11a2a24d
parent6d3ec1ae6cdcda185bd9452b2daed5145e2493a5
ARM: 7314/1: kuser: consistently use usr_ret for returning from helpers

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

Acked-by: Dave Martin <dave.martin@linaro.org>
Acked-by: Nicolas Pitre <nico@linaro.org>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
arch/arm/kernel/entry-armv.S