From 44c46668b03d190dc2caa659080a304e319c0338 Mon Sep 17 00:00:00 2001 From: Matthew McClintock Date: Tue, 25 Oct 2011 17:54:03 -0500 Subject: [PATCH] --- yaml --- r: 274240 b: refs/heads/master c: 7d0d3ad5e3cfbf96aa4a2d6ee26a20c98a29d4a1 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/powerpc/kernel/head_fsl_booke.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2acce4a4db22..a96086e03a8d 100644 --- 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 index e1c699f3b7a7..9f5d210ddf3f 100644 --- 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) */