===== arch/ppc64/kernel/head.S 1.41 vs edited =====
--- 1.41/arch/ppc64/kernel/head.S	Fri Nov 21 01:20:34 2003
+++ edited/arch/ppc64/kernel/head.S	Thu Dec 11 10:48:27 2003
@@ -978,19 +978,11 @@
 	mulld   r20,r20,r21
 	clrldi  r20,r20,28      /* r20 = vsid */

-	/* Search the SLB for a free entry */
-	li      r22,1
-1:
-	slbmfee	r23,r22
-	rldicl  r23,r23,37,63
-	cmpwi   r23,0
-	beq     4f              /* Found an invalid entry              */
+	/* We don't care to look for a free entry, just take the
+	 * next one, round-robin. Searching takes too long, and we'll
+	 * just fault in the evicted one if it's needed again. -ojn
+	 */

-	addi	r22,r22,1
-	cmpldi	r22,64
-	blt	1b
-
-	/* No free entry - just take the next entry, round-robin */
 	/* XXX we should get the number of SLB entries from the naca */
 SLB_NUM_ENTRIES = 64
 2:	mfspr	r21,SPRG3