diff options
author | Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:52:27 +0100 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2009-02-24 21:52:27 +0100 |
commit | 87b203079ed949de52f0d92aeae20e5e0116c12f (patch) | |
tree | 1878756f936963822ed2d51a15db1da5814973e7 /arch/sparc/lib/GENcopy_to_user.S | |
parent | 58105ef1857112a186696c9b8957020090226a28 (diff) | |
parent | a852cbfaaf8122827602027b1614971cfd832304 (diff) | |
download | op-kernel-dev-87b203079ed949de52f0d92aeae20e5e0116c12f.zip op-kernel-dev-87b203079ed949de52f0d92aeae20e5e0116c12f.tar.gz |
Merge branch 'x86/core' into core/percpu
Diffstat (limited to 'arch/sparc/lib/GENcopy_to_user.S')
-rw-r--r-- | arch/sparc/lib/GENcopy_to_user.S | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/arch/sparc/lib/GENcopy_to_user.S b/arch/sparc/lib/GENcopy_to_user.S index bb3f708..780550e 100644 --- a/arch/sparc/lib/GENcopy_to_user.S +++ b/arch/sparc/lib/GENcopy_to_user.S @@ -5,13 +5,9 @@ #define EX_ST(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; @@ -31,7 +27,7 @@ #define PREAMBLE \ rd %asi, %g1; \ cmp %g1, ASI_AIUS; \ - bne,pn %icc, memcpy_user_stub; \ + bne,pn %icc, ___copy_in_user; \ nop #endif |