aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc/lib/U3copy_to_user.S
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-08-15 14:47:54 -0700
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-11-21 10:06:41 +0100
commitdd8a78b2b6ad24c7416dfe0443a31456cbad3b34 (patch)
treead128ffb2e65e538216d00f97c3d4f3e0748f83f /arch/sparc/lib/U3copy_to_user.S
parent756723ad553d02553397ea991c28812b91aa6cda (diff)
sparc64: Prepare to move to more saner user copy exception handling.
[ Upstream commit 83a17d2661674d8c198adc0e183418f72aabab79 ] The fixup helper function mechanism for handling user copy fault handling is not %100 accurrate, and can never be made so. We are going to transition the code to return the running return return length, which is always kept track in one or more registers of each of these routines. In order to convert them one by one, we have to allow the existing behavior to continue functioning. Therefore make all the copy code that wants the fixup helper to be used return negative one. After all of the user copy routines have been converted, this logic and the fixup helpers themselves can be removed completely. Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/sparc/lib/U3copy_to_user.S')
-rw-r--r--arch/sparc/lib/U3copy_to_user.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/lib/U3copy_to_user.S b/arch/sparc/lib/U3copy_to_user.S
index 845139d75537..032b0c5419b0 100644
--- a/arch/sparc/lib/U3copy_to_user.S
+++ b/arch/sparc/lib/U3copy_to_user.S
@@ -7,7 +7,7 @@
98: x; \
.section __ex_table,"a";\
.align 4; \
- .word 98b, __retl_one; \
+ .word 98b, __retl_mone; \
.text; \
.align 4;
@@ -15,7 +15,7 @@
98: x; \
.section __ex_table,"a";\
.align 4; \
- .word 98b, __retl_one_fp;\
+ .word 98b, __retl_mone_fp;\
.text; \
.align 4;