patch-2.2.4 linux/arch/ppc/lib/string.S

• Lines: 46
• Date: Wed Mar 10 21:30:32 1999
• Orig file: v2.2.3/linux/arch/ppc/lib/string.S
• Orig date: Mon Oct 5 13:13:36 1998

diff -u --recursive --new-file v2.2.3/linux/arch/ppc/lib/string.S linux/arch/ppc/lib/string.S
@@ -321,8 +321,6 @@
 	.long	75b,76b
 .text
 
-#undef CLEAR_USE_DCBZ 1
-#undef CLEAR_NO_CACHE 1
 	.globl	__clear_user
 __clear_user:
 	addi	r6,r3,-4
@@ -333,15 +331,6 @@
 	/* clear a single word */
 11:	stwu	r5,4(r6)
 	beqlr
-#if defined(CLEAR_NO_CACHE) && defined (CONFIG_6xx)
-	/* 
-	 * no reason to turn off the cache for a single word 
-	 * or a few bytes -- Cort 
-	 */
-	mfspr	r7,HID0
-	ori	r8,r7,HID0_DLOCK
-	mtspr	HID0,r8
-#endif /* CLEAR_NO_CACHE */
 	/* clear word sized chunks */
 	andi.	r0,r6,3
 	add	r4,r0,r4
@@ -353,10 +342,6 @@
 1:	stwu	r5,4(r6)
 	bdnz	1b
 6:	andi.	r4,r4,3
-#if defined(CLEAR_NO_CACHE) && defined (CONFIG_6xx)
-	/* restore the original state of HID0 in case cache was off -- Cort */
-	mtspr	HID0,r7
-#endif /* CLEAR_NO_CACHE */	
 	/* clear byte sized chunks */
 7:	cmpwi	0,r4,0
 	beqlr
@@ -371,9 +356,6 @@
 	.align	2
 	.long	11b,99b
 	.long	1b,99b
-#ifdef CLEAR_USE_DCBZ
-	/*.long	66b,99b*/
-#endif		
 	.long	8b,99b
 .text