From 151a80be52e078cae9f3c55d25f6cf4eab63b39c Mon Sep 17 00:00:00 2001 From: "George G. Davis" Date: Sat, 1 Dec 2007 05:49:41 +0100 Subject: [PATCH] --- yaml --- r: 77464 b: refs/heads/master c: 7b544c99e0328937932022da3cbdd38cf3f072ec h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/arm/kernel/entry-common.S | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 4c43d9b364fd..a1e084986030 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d2936b1976a9c70d1cce4700c51f26d4b9495e9d +refs/heads/master: 7b544c99e0328937932022da3cbdd38cf3f072ec diff --git a/trunk/arch/arm/kernel/entry-common.S b/trunk/arch/arm/kernel/entry-common.S index 33e6cc2ffd3b..6c90c50a9ee3 100644 --- a/trunk/arch/arm/kernel/entry-common.S +++ b/trunk/arch/arm/kernel/entry-common.S @@ -72,7 +72,7 @@ no_work_pending: ldr r1, [sp, #S_PSR] @ get calling cpsr ldr lr, [sp, #S_PC]! @ get pc msr spsr_cxsf, r1 @ save in spsr_svc - ldmdb sp, {r0 - lr}^ @ get calling r1 - lr + ldmdb sp, {r0 - lr}^ @ get calling r0 - lr mov r0, r0 add sp, sp, #S_FRAME_SIZE - S_PC movs pc, lr @ return & move spsr_svc into cpsr