aboutsummaryrefslogtreecommitdiff
path: root/arch/sparc64
diff options
context:
space:
mode:
authorDavid S. Miller <davem@sunset.davemloft.net>2006-02-11 10:30:41 -0800
committerDavid S. Miller <davem@sunset.davemloft.net>2006-03-20 01:12:20 -0800
commit0d4bc95b9c205a7374afbe93b38d9c2757a45862 (patch)
treee43b03a266da9786355941246b77f30058e7058d /arch/sparc64
parente92b92571c85dfa1cdc56e88566134c51ae1d12b (diff)
[SPARC64]: Fix some Niagara memcpy() bugs.
We need to restore the %asi register properly. For the kernel this means get_fs(), for user this means ASI_PNF. Also, NGcopy_to_user.S was including U3memcpy.S instead of NGmemcpy.S, oops :-) Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'arch/sparc64')
-rw-r--r--arch/sparc64/lib/NGcopy_to_user.S2
-rw-r--r--arch/sparc64/lib/NGmemcpy.S10
2 files changed, 8 insertions, 4 deletions
diff --git a/arch/sparc64/lib/NGcopy_to_user.S b/arch/sparc64/lib/NGcopy_to_user.S
index 4a12395b450..34112d5054e 100644
--- a/arch/sparc64/lib/NGcopy_to_user.S
+++ b/arch/sparc64/lib/NGcopy_to_user.S
@@ -37,4 +37,4 @@
nop
#endif
-#include "U3memcpy.S"
+#include "NGmemcpy.S"
diff --git a/arch/sparc64/lib/NGmemcpy.S b/arch/sparc64/lib/NGmemcpy.S
index a39aa3bd434..8e522b3dc09 100644
--- a/arch/sparc64/lib/NGmemcpy.S
+++ b/arch/sparc64/lib/NGmemcpy.S
@@ -5,11 +5,15 @@
#ifdef __KERNEL__
#include <asm/asi.h>
+#include <asm/thread_info.h>
#define GLOBAL_SPARE %g7
-#define RESTORE_ASI wr %g0, ASI_AIUS, %asi
+#define RESTORE_ASI(TMP) \
+ ldub [%g6 + TI_CURRENT_DS], TMP; \
+ wr TMP, 0x0, %asi;
#else
#define GLOBAL_SPARE %g5
-#define RESTORE_ASI
+#define RESTORE_ASI(TMP) \
+ wr %g0, ASI_PNF, %asi
#endif
#ifndef STORE_ASI
@@ -246,7 +250,7 @@ FUNC_NAME: /* %o0=dst, %o1=src, %o2=len */
/* %o2 contains any final bytes still needed to be copied
* over. If anything is left, we copy it one byte at a time.
*/
- RESTORE_ASI
+ RESTORE_ASI(%o3)
brz,pt %o2, 85f
sub %o0, %o1, %o3
ba,a,pt %XCC, 90f