From 3a37963ce6f7fa197e23b52a3d2b3ce5a5849442 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 13 Jun 2011 15:52:47 +0100 Subject: [PATCH] --- yaml --- r: 258239 b: refs/heads/master c: dbc125168fd7dda4ffb24a29548746c7bd3b3d87 h: refs/heads/master i: 258237: d913cddc53a41473561f798bbb63ca5fd9d1e905 258235: 07110c45165e3fa648849813da5ab42bdc6472e2 258231: 6dd3ccab17670203eaddc9bf6ca8f99b9a4bb870 258223: ffe811fa26e7238896351b1c9a21047af47286eb 258207: 5dcf7cfcfc50d5e047ab5db47ae3fdf1340ec531 258175: b298378ed2d5757319b2bfa5815182376165b6a5 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-pxa/sleep.S | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index e1e8c95372a9..3a2c364a8c29 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3799bbe57843d279008c9ec3406838966cad5f15 +refs/heads/master: dbc125168fd7dda4ffb24a29548746c7bd3b3d87 diff --git a/trunk/arch/arm/mach-pxa/sleep.S b/trunk/arch/arm/mach-pxa/sleep.S index 6f5368899d84..613ddfa2c295 100644 --- a/trunk/arch/arm/mach-pxa/sleep.S +++ b/trunk/arch/arm/mach-pxa/sleep.S @@ -59,7 +59,7 @@ ENTRY(pxa27x_cpu_suspend) mra r2, r3, acc0 #endif stmfd sp!, {r2 - r12, lr} @ save registers on stack - mov r4, r0 @ save sleep mode + mov r2, r0 @ save sleep mode ldr r3, =pxa_cpu_resume @ resume function bl cpu_suspend @@ -67,7 +67,7 @@ ENTRY(pxa27x_cpu_suspend) @ (also workaround for sighting 28071) @ prepare value for sleep mode - mov r1, r4 @ sleep mode + mov r1, r0 @ sleep mode @ prepare pointer to physical address 0 (virtual mapping in generic.c) mov r2, #UNCACHED_PHYS_0 @@ -109,11 +109,11 @@ ENTRY(pxa27x_cpu_suspend) ENTRY(pxa25x_cpu_suspend) stmfd sp!, {r2 - r12, lr} @ save registers on stack - mov r4, r0 @ save sleep mode + mov r2, r0 @ save sleep mode ldr r3, =pxa_cpu_resume @ resume function bl cpu_suspend @ prepare value for sleep mode - mov r1, r4 @ sleep mode + mov r1, r0 @ sleep mode @ prepare pointer to physical address 0 (virtual mapping in generic.c) mov r2, #UNCACHED_PHYS_0