From: Will Deacon <will.deacon@arm.com>
Date: Fri, 3 Feb 2012 10:08:05 +0000 (+0100)
Subject: ARM: 7314/1: kuser: consistently use usr_ret for returning from helpers
X-Git-Tag: v3.3-rc3~27^2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5a97d0ae5b5d78727b87965cba84194a9f1e06ce;p=pandora-kernel.git

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

Reading git-diff-tree failed