From 420f0ccaace1e40f73c926159ac48a5250750fe1 Mon Sep 17 00:00:00 2001
From: Anton Blanchard <anton@samba.org>
Date: Tue, 7 Aug 2012 17:50:46 +0000
Subject: [PATCH] --- yaml --- r: 322280 b: refs/heads/master c:
 dad477ccd65f05bf3b5a874e0118bf4156a1fcbb h: refs/heads/master v: v3

---
 [refs]                                   |  2 +-
 trunk/arch/powerpc/lib/copyuser_power7.S | 31 ------------------------
 2 files changed, 1 insertion(+), 32 deletions(-)

diff --git a/[refs] b/[refs]
index 9291bfbe4d2c..9d11026469b4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7256a5d2da56f2ea8ad49e8dbe9e2984f0899b42
+refs/heads/master: dad477ccd65f05bf3b5a874e0118bf4156a1fcbb
diff --git a/trunk/arch/powerpc/lib/copyuser_power7.S b/trunk/arch/powerpc/lib/copyuser_power7.S
index f9ede7c6606e..4a4a46fbad0e 100644
--- a/trunk/arch/powerpc/lib/copyuser_power7.S
+++ b/trunk/arch/powerpc/lib/copyuser_power7.S
@@ -316,37 +316,6 @@ err1;	stb	r0,0(r3)
 	lis	r8,0x8000	/* GO=1 */
 	clrldi	r8,r8,32
 
-.machine push
-.machine "power4"
-	dcbt	r0,r6,0b01000
-	dcbt	r0,r7,0b01010
-	dcbtst	r0,r9,0b01000
-	dcbtst	r0,r10,0b01010
-	eieio
-	dcbt	r0,r8,0b01010	/* GO */
-.machine pop
-
-	/*
-	 * We prefetch both the source and destination using enhanced touch
-	 * instructions. We use a stream ID of 0 for the load side and
-	 * 1 for the store side.
-	 */
-	clrrdi	r6,r4,7
-	clrrdi	r9,r3,7
-	ori	r9,r9,1		/* stream=1 */
-
-	srdi	r7,r5,7		/* length in cachelines, capped at 0x3FF */
-	cmpldi	cr1,r7,0x3FF
-	ble	cr1,1f
-	li	r7,0x3FF
-1:	lis	r0,0x0E00	/* depth=7 */
-	sldi	r7,r7,7
-	or	r7,r7,r0
-	ori	r10,r7,1	/* stream=1 */
-
-	lis	r8,0x8000	/* GO=1 */
-	clrldi	r8,r8,32
-
 .machine push
 .machine "power4"
 	dcbt	r0,r6,0b01000