git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'linus' into core/printk
[sfrench/cifs-2.6.git]
/
arch
/
sparc
/
lib
/
U3copy_to_user.S
diff --git
a/arch/sparc/lib/U3copy_to_user.S
b/arch/sparc/lib/U3copy_to_user.S
index 2334f111bb0c81c36f4b1016725a238650e28d97..ef1e493afdfa900a1b32863c2bf2995560cbe0cd 100644
(file)
--- a/
arch/sparc/lib/U3copy_to_user.S
+++ b/
arch/sparc/lib/U3copy_to_user.S
@@
-5,13
+5,9
@@
#define EX_ST(x) \
98: x; \
#define EX_ST(x) \
98: x; \
- .section .fixup; \
- .align 4; \
-99: retl; \
- mov 1, %o0; \
.section __ex_table,"a";\
.align 4; \
.section __ex_table,"a";\
.align 4; \
- .word 98b,
99b;
\
+ .word 98b,
__retl_one;
\
.text; \
.align 4;
.text; \
.align 4;
@@
-27,7
+23,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; \
#include "U3memcpy.S"
nop; \
#include "U3memcpy.S"