X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=arch%2Fsparc64%2Flib%2FNGmemcpy.S;h=8e522b3dc095e2100760c87425488de66ecbfad7;hb=93fdf10d4c28edaa1b9f80e7f9c3002359186d00;hp=a39aa3bd434529bf1525b380956bd0b6727ea370;hpb=398d10830843bda7798f71052b54a5341a8ddd53;p=powerpc.git

diff --git a/arch/sparc64/lib/NGmemcpy.S b/arch/sparc64/lib/NGmemcpy.S
index a39aa3bd43..8e522b3dc0 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