summaryrefslogtreecommitdiff
path: root/arch/sparc/lib/NG2copy_from_user.S
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2016-08-15 14:47:54 -0700
committerDavid S. Miller <davem@davemloft.net>2016-10-24 11:31:58 -0700
commit83a17d2661674d8c198adc0e183418f72aabab79 (patch)
treedfda84fcce63b99268c872b9264e302e4dc8f13c /arch/sparc/lib/NG2copy_from_user.S
parentaa95ce361ed95c72ac42dcb315166bce5cf1a014 (diff)
downloadlwn-83a17d2661674d8c198adc0e183418f72aabab79.tar.gz
lwn-83a17d2661674d8c198adc0e183418f72aabab79.zip
sparc64: Prepare to move to more saner user copy exception handling.
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>
Diffstat (limited to 'arch/sparc/lib/NG2copy_from_user.S')
-rw-r--r--arch/sparc/lib/NG2copy_from_user.S4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/sparc/lib/NG2copy_from_user.S b/arch/sparc/lib/NG2copy_from_user.S
index d5242b8c4f94..4d47fa5519d4 100644
--- a/arch/sparc/lib/NG2copy_from_user.S
+++ b/arch/sparc/lib/NG2copy_from_user.S
@@ -7,7 +7,7 @@
98: x; \
.section __ex_table,"a";\
.align 4; \
- .word 98b, __retl_one_asi;\
+ .word 98b, __retl_mone_asi;\
.text; \
.align 4;
@@ -15,7 +15,7 @@
98: x; \
.section __ex_table,"a";\
.align 4; \
- .word 98b, __retl_one_asi_fp;\
+ .word 98b, __retl_mone_asi_fp;\
.text; \
.align 4;