diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-10 11:48:49 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2009-02-10 11:48:49 -0800 |
| commit | 226b79104f625f3f58a8388b8b32a4b90415bf02 (patch) | |
| tree | 408a91f47b33fd59711a75cebbcb69a22b9fe7cd /arch/sparc/lib/NGcopy_to_user.S | |
| parent | 29ef01179d37168a021293ede77afbf091a49af4 (diff) | |
| parent | aeb398768345c74a9e4c01aa3ebf839e858312ec (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6
* git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-2.6:
sparc64: Fix probe_kernel_{read,write}().
sparc64: Kill .fixup section bloat.
sparc64: Don't hook up pcr_ops on spitfire chips.
sparc64: Call dump_stack() in die_nmi().
Diffstat (limited to 'arch/sparc/lib/NGcopy_to_user.S')
| -rw-r--r-- | arch/sparc/lib/NGcopy_to_user.S | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/sparc/lib/NGcopy_to_user.S b/arch/sparc/lib/NGcopy_to_user.S index 6ea01c5532a..ff630dcb273 100644 --- a/arch/sparc/lib/NGcopy_to_user.S +++ b/arch/sparc/lib/NGcopy_to_user.S @@ -5,14 +5,9 @@ #define EX_ST(x) \ 98: x; \ - .section .fixup; \ - .align 4; \ -99: wr %g0, ASI_AIUS, %asi;\ - ret; \ - restore %g0, 1, %o0; \ .section __ex_table,"a";\ .align 4; \ - .word 98b, 99b; \ + .word 98b, __ret_one_asi;\ .text; \ .align 4; @@ -33,7 +28,7 @@ #define PREAMBLE \ rd %asi, %g1; \ cmp %g1, ASI_AIUS; \ - bne,pn %icc, memcpy_user_stub; \ + bne,pn %icc, ___copy_in_user; \ nop #endif |