---

yaml --- r: 274240 b: refs/heads/master c: 7d0d3ad h: refs/heads/master v: v3
git-mirror · Nov 3, 2011 · 44c4666 · 44c4666
1 parent 0d6c57a
commit 44c4666
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: 44f16fcf2fba79cffb268d8f3c1f744efefa5dc9
+refs/heads/master: 7d0d3ad5e3cfbf96aa4a2d6ee26a20c98a29d4a1
diff --git a/trunk/arch/powerpc/kernel/head_fsl_booke.S b/trunk/arch/powerpc/kernel/head_fsl_booke.S
@@ -80,8 +80,8 @@ _ENTRY(_start);
 	slw	r18,r18,r17		/* r18 = page size */
 	addi	r18,r18,-1
 	and	r19,r3,r18		/* r19 = page offset */
-	andc	r31,r20,r18		/* r3 = page base */
-	or	r31,r31,r19		/* r3 = devtree phys addr */
+	andc	r31,r20,r18		/* r31 = page base */
+	or	r31,r31,r19		/* r31 = devtree phys addr */
 	mfspr	r30,SPRN_MAS7
 
 	li	r25,0			/* phys kernel start (low) */