From 87e3a83527bf63db366ebdc63d0ee962214ed8e5 Mon Sep 17 00:00:00 2001 From: "Aric D. Blumer" Date: Wed, 29 Dec 2010 11:18:29 -0500 Subject: [PATCH] --- yaml --- r: 223753 b: refs/heads/master c: 24c78557741395e038e83f25367cf2bfd7f582b8 h: refs/heads/master i: 223751: b60702a76c80c91d6af13cd1f67859d8dda11fbf v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/sleep.S | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 2ab786039c36..4ccddb195767 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 823a2df258627b80df2e75056b850424a8eb5fed +refs/heads/master: 24c78557741395e038e83f25367cf2bfd7f582b8 diff --git a/trunk/arch/arm/mach-pxa/sleep.S b/trunk/arch/arm/mach-pxa/sleep.S index 52c30b01a671..ae008110db4e 100644 --- a/trunk/arch/arm/mach-pxa/sleep.S +++ b/trunk/arch/arm/mach-pxa/sleep.S @@ -353,8 +353,8 @@ resume_turn_on_mmu: @ Let us ensure we jump to resume_after_mmu only when the mcr above @ actually took effect. They call it the "cpwait" operation. - mrc p15, 0, r1, c2, c0, 0 @ queue a dependency on CP15 - sub pc, r2, r1, lsr #32 @ jump to virtual addr + mrc p15, 0, r0, c2, c0, 0 @ queue a dependency on CP15 + sub pc, r2, r0, lsr #32 @ jump to virtual addr nop nop nop