From 2cc9ab7560033b8b3805fe51ddf77387dc74af8d Mon Sep 17 00:00:00 2001
From: Russell King <rmk@dyn-67.arm.linux.org.uk>
Date: Fri, 11 Jan 2008 12:23:58 +0000
Subject: [PATCH] --- yaml --- r: 75592 b: refs/heads/master c:
 3b1904d00a54d4d839a4c12dbc98a14dc4efdc95 h: refs/heads/master v: v3

---
 [refs]                          | 2 +-
 trunk/arch/arm/mach-pxa/sleep.S | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/[refs] b/[refs]
index 7f857eadafde..a1cc931dad36 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a7da60f41551abb3c520b03d42ec05dd7decfc7f
+refs/heads/master: 3b1904d00a54d4d839a4c12dbc98a14dc4efdc95
diff --git a/trunk/arch/arm/mach-pxa/sleep.S b/trunk/arch/arm/mach-pxa/sleep.S
index aff71fec618a..d0447723b73a 100644
--- a/trunk/arch/arm/mach-pxa/sleep.S
+++ b/trunk/arch/arm/mach-pxa/sleep.S
@@ -43,11 +43,11 @@ pxa_cpu_save_cp:
 pxa_cpu_save_sp:
 	@ preserve phys address of stack
 	mov	r0, sp
-	mov	r2, lr
+	str	lr, [sp, #-4]!
 	bl	sleep_phys_sp
 	ldr	r1, =sleep_save_sp
 	str	r0, [r1]
-	mov	pc, r2
+	ldr	pc, [sp], #4
 
 /*
  * pxa27x_cpu_suspend()
@@ -270,5 +270,3 @@ resume_after_mmu:
 	mar	acc0, r2, r3
 #endif
 	ldmfd	sp!, {r4 - r12, pc}		@ return to caller
-
-