1 files changed, 7 insertions, 5 deletions
diff --git a/arch/powerpc/lib/copyuser_power7.S b/arch/powerpc/lib/copyuser_power7.S
index 0d24ff15f5f6..d1f11795a7ad 100644
--- a/arch/powerpc/lib/copyuser_power7.S
+++ b/arch/powerpc/lib/copyuser_power7.S
@@ -318,12 +318,14 @@ err1;	stb	r0,0(r3)
 .machine push
 .machine "power4"
-        dcbt    r0,r6,0b01000
+        /* setup read stream 0 */
-        dcbt    r0,r7,0b01010
+        dcbt    r0,r6,0b01000   /* addr from */
-        dcbtst  r0,r9,0b01000
+        dcbt    r0,r7,0b01010   /* length and depth from */
-        dcbtst  r0,r10,0b01010
+        /* setup write stream 1 */
+        dcbtst  r0,r9,0b01000   /* addr to */
+        dcbtst  r0,r10,0b01010  /* length and depth to */
        eieio
-        dcbt    r0,r8,0b01010   /* GO */
+        dcbt    r0,r8,0b01010   /* all streams GO */
 .machine pop
        beq     cr1,.Lunwind_stack_nonvmx_copy

diff --git a/arch/powerpc/lib/copyuser_power7.S b/arch/powerpc/lib/copyuser_power7.S index 0d24ff15f5f6..d1f11795a7ad 100644 --- a/arch/powerpc/lib/copyuser_power7.S +++ b/arch/powerpc/lib/copyuser_power7.S
@@ -318,12 +318,14 @@ err1; stb r0,0(r3)
318		318
319	.machine push	319	.machine push
320	.machine "power4"	320	.machine "power4"
321	dcbt r0,r6,0b01000	321	/* setup read stream 0 */
322	dcbt r0,r7,0b01010	322	dcbt r0,r6,0b01000 /* addr from */
323	dcbtst r0,r9,0b01000	323	dcbt r0,r7,0b01010 /* length and depth from */
324	dcbtst r0,r10,0b01010	324	/* setup write stream 1 */
		325	dcbtst r0,r9,0b01000 /* addr to */
		326	dcbtst r0,r10,0b01010 /* length and depth to */
325	eieio	327	eieio
326	dcbt r0,r8,0b01010 /* GO */	328	dcbt r0,r8,0b01010 /* all streams GO */
327	.machine pop	329	.machine pop
328		330
329	beq cr1,.Lunwind_stack_nonvmx_copy	331	beq cr1,.Lunwind_stack_nonvmx_copy