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 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/dlm
[sfrench/cifs-2.6.git]
/
arch
/
sparc
/
lib
/
U3copy_from_user.S
diff --git
a/arch/sparc/lib/U3copy_from_user.S
b/arch/sparc/lib/U3copy_from_user.S
index f5bfc8d9d216686b031d685aa8f577fab4634324..b1acd1331c338fce1a70e6a13f597509b28501a7 100644
(file)
--- a/
arch/sparc/lib/U3copy_from_user.S
+++ b/
arch/sparc/lib/U3copy_from_user.S
@@
-5,13
+5,9
@@
#define EX_LD(x) \
98: x; \
- .section .fixup; \
- .align 4; \
-99: retl; \
- mov 1, %o0; \
.section __ex_table,"a";\
.align 4; \
- .word 98b,
99b;
\
+ .word 98b,
__retl_one;
\
.text; \
.align 4;