summaryrefslogtreecommitdiffstats
path: root/arch/sparc/lib/U3copy_to_user.S
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-05-05 08:20:52 +0200
committerIngo Molnar <mingo@kernel.org>2017-05-05 08:21:03 +0200
commit415812f2d6b856d33ede9bf4a2b95575dbbb3d4e (patch)
tree4daf9ca52f89ea59453538b406f584d47c77aff3 /arch/sparc/lib/U3copy_to_user.S
parentx86/asm: Don't use RBP as a temporary register in csum_partial_copy_generic() (diff)
parentMerge branch 'x86-mm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/... (diff)
downloadlinux-415812f2d6b856d33ede9bf4a2b95575dbbb3d4e.tar.xz
linux-415812f2d6b856d33ede9bf4a2b95575dbbb3d4e.zip
Merge branch 'linus' into x86/urgent, to pick up dependent commits
We are going to fix a bug introduced by a more recent commit, so refresh the tree. Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/sparc/lib/U3copy_to_user.S')
-rw-r--r--arch/sparc/lib/U3copy_to_user.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/sparc/lib/U3copy_to_user.S b/arch/sparc/lib/U3copy_to_user.S
index c4ee858e352a..f48fb87fe9f2 100644
--- a/arch/sparc/lib/U3copy_to_user.S
+++ b/arch/sparc/lib/U3copy_to_user.S
@@ -31,7 +31,7 @@
#define PREAMBLE \
rd %asi, %g1; \
cmp %g1, ASI_AIUS; \
- bne,pn %icc, ___copy_in_user; \
+ bne,pn %icc, raw_copy_in_user; \
nop; \
#include "U3memcpy.S"