diff options
| author | Ingo Molnar <mingo@elte.hu> | 2009-03-17 16:21:20 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-03-17 16:21:20 +0100 |
| commit | 47239561e39bceefecc3cd67f71fcf86a198a8ff (patch) | |
| tree | 9823d0973494ea8acabb744bc3aba42b610fb434 /arch/sparc/lib/NG2copy_to_user.S | |
| parent | ed681a91ab805341675d166a9592551093c0a2d9 (diff) | |
| parent | 5bee17f18b595937e6beafeee5197868a3f74a06 (diff) | |
| download | op-kernel-dev-47239561e39bceefecc3cd67f71fcf86a198a8ff.zip op-kernel-dev-47239561e39bceefecc3cd67f71fcf86a198a8ff.tar.gz | |
Merge branch 'linus' into core/printk
Diffstat (limited to 'arch/sparc/lib/NG2copy_to_user.S')
| -rw-r--r-- | arch/sparc/lib/NG2copy_to_user.S | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/sparc/lib/NG2copy_to_user.S b/arch/sparc/lib/NG2copy_to_user.S index 4bd4093..7fe1cce 100644 --- a/arch/sparc/lib/NG2copy_to_user.S +++ b/arch/sparc/lib/NG2copy_to_user.S @@ -5,14 +5,9 @@ #define EX_ST(x) \ 98: x; \ - .section .fixup; \ - .align 4; \ -99: wr %g0, ASI_AIUS, %asi;\ - retl; \ - mov 1, %o0; \ .section __ex_table,"a";\ .align 4; \ - .word 98b, 99b; \ + .word 98b, __retl_one_asi;\ .text; \ .align 4; @@ -42,7 +37,7 @@ #define PREAMBLE \ rd %asi, %g1; \ cmp %g1, ASI_AIUS; \ - bne,pn %icc, memcpy_user_stub; \ + bne,pn %icc, ___copy_in_user; \ nop #endif |
