---

yaml --- r: 181923 b: refs/heads/master c: 51adc54 h: refs/heads/master i: 181921: 4d65e16 181919: f67adc2 v: v3
git-mirror · Feb 18, 2010 · 9294a11 · 9294a11
1 parent 3faf1ab
commit 9294a11
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: efd0f0f385da6ee6d1a22cfe1ac94607ebe2a292
+refs/heads/master: 51adc548cb0b2441ee9d4c428a84b77021f4d3fa
diff --git a/trunk/arch/powerpc/kernel/head_fsl_booke.S b/trunk/arch/powerpc/kernel/head_fsl_booke.S
@@ -214,11 +214,11 @@ skpinv:	addi	r6,r6,1				/* Increment */
 	bl	1f		/* Find our address */
 1:	mflr	r9
 	rlwimi	r7,r9,0,20,31
-	addi	r7,r7,24
+	addi	r7,r7,(2f - 1b)
 	mtspr	SPRN_SRR0,r7
 	mtspr	SPRN_SRR1,r6
 	rfi
-
+2:
 /* 4. Clear out PIDs & Search info */
 	li	r6,0
 	mtspr   SPRN_MAS6,r6