diff options
| author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-02 10:35:28 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-10-02 10:35:28 -0700 |
| commit | 114d5b1ca265f8a582dcbf0030da20ccdddbe8e1 (patch) | |
| tree | 7c3ada09fe64eadf184a0b59e83b176fd2a72b65 /arch/sparc64/lib/NGcopy_from_user.S | |
| parent | 2b3b29080d702e5488f214276170ab46adc40ee5 (diff) | |
| parent | 25e5566ed38650f7990041fcd20571d6ddd2a040 (diff) | |
| download | op-kernel-dev-114d5b1ca265f8a582dcbf0030da20ccdddbe8e1.zip op-kernel-dev-114d5b1ca265f8a582dcbf0030da20ccdddbe8e1.tar.gz | |
Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6
* 'master' of master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6:
[SPARC64]: Fix missing load-twin usage in Niagara-1 memcpy.
[SPARC64]: Fix put_user() calls in binfmt_aout32.c
[SPARC]: Fix EBUS use of uninitialized variable.
Diffstat (limited to 'arch/sparc64/lib/NGcopy_from_user.S')
| -rw-r--r-- | arch/sparc64/lib/NGcopy_from_user.S | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/sparc64/lib/NGcopy_from_user.S b/arch/sparc64/lib/NGcopy_from_user.S index 2d93456..e7f433f 100644 --- a/arch/sparc64/lib/NGcopy_from_user.S +++ b/arch/sparc64/lib/NGcopy_from_user.S @@ -1,6 +1,6 @@ /* NGcopy_from_user.S: Niagara optimized copy from userspace. * - * Copyright (C) 2006 David S. Miller (davem@davemloft.net) + * Copyright (C) 2006, 2007 David S. Miller (davem@davemloft.net) */ #define EX_LD(x) \ @@ -8,8 +8,8 @@ .section .fixup; \ .align 4; \ 99: wr %g0, ASI_AIUS, %asi;\ - retl; \ - mov 1, %o0; \ + ret; \ + restore %g0, 1, %o0; \ .section __ex_table,"a";\ .align 4; \ .word 98b, 99b; \ @@ -24,7 +24,7 @@ #define LOAD(type,addr,dest) type##a [addr] ASI_AIUS, dest #define LOAD_TWIN(addr_reg,dest0,dest1) \ ldda [addr_reg] ASI_BLK_INIT_QUAD_LDD_AIUS, dest0 -#define EX_RETVAL(x) 0 +#define EX_RETVAL(x) %g0 #ifdef __KERNEL__ #define PREAMBLE \ |
