projects
/
firefly-linux-kernel-4.4.55.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'nfsd-4.4' of git://linux-nfs.org/~bfields/linux
[firefly-linux-kernel-4.4.55.git]
/
arch
/
sparc
/
lib
/
NGcopy_from_user.S
diff --git
a/arch/sparc/lib/NGcopy_from_user.S
b/arch/sparc/lib/NGcopy_from_user.S
index e7f433f71b42bd473b06e22e7b70e0e40e111c9b..5d1e4d1ac21edf09a664663dc005e1fcae805b6a 100644
(file)
--- a/
arch/sparc/lib/NGcopy_from_user.S
+++ b/
arch/sparc/lib/NGcopy_from_user.S
@@
-5,14
+5,9
@@
#define EX_LD(x) \
98: x; \
#define EX_LD(x) \
98: x; \
- .section .fixup; \
- .align 4; \
-99: wr %g0, ASI_AIUS, %asi;\
- ret; \
- restore %g0, 1, %o0; \
.section __ex_table,"a";\
.align 4; \
.section __ex_table,"a";\
.align 4; \
- .word 98b,
99b;
\
+ .word 98b,
__ret_one_asi;
\
.text; \
.align 4;
.text; \
.align 4;
@@
-30,7
+25,7
@@
#define PREAMBLE \
rd %asi, %g1; \
cmp %g1, ASI_AIUS; \
#define PREAMBLE \
rd %asi, %g1; \
cmp %g1, ASI_AIUS; \
- bne,pn %icc,
memcpy_user_stub;
\
+ bne,pn %icc,
___copy_in_user;
\
nop
#endif
nop
#endif