Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit dad477cc authored by Anton Blanchard's avatar Anton Blanchard Committed by Benjamin Herrenschmidt
Browse files

powerpc: POWER7 copy_to_user/copy_from_user patch applied twice 



"powerpc: Use enhanced touch instructions in POWER7
copy_to_user/copy_from_user" was applied twice. Remove one.

Signed-off-by: default avatarAnton Blanchard <anton@samba.org>
Signed-off-by: default avatarBenjamin Herrenschmidt <benh@kernel.crashing.org>
parent 7256a5d2

arch/powerpc/lib/copyuser_power7.S

+0 −31
Original line number Original line Diff line number Diff line
@@ -316,37 +316,6 @@ err1; stb r0,0(r3) 
	lis	r8,0x8000	/* GO=1 */

	lis	r8,0x8000	/* GO=1 */

	clrldi	r8,r8,32

	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 push

.machine "power4"

.machine "power4"

	dcbt	r0,r6,0b01000

	dcbt	r0,r6,0b01000