---

yaml --- r: 223753 b: refs/heads/master c: 24c7855 h: refs/heads/master i: 223751: b60702a v: v3
git-mirror · Jan 3, 2011 · 87e3a83 · 87e3a83
1 parent af3d67d
commit 87e3a83
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: 823a2df258627b80df2e75056b850424a8eb5fed
+refs/heads/master: 24c78557741395e038e83f25367cf2bfd7f582b8
diff --git 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