aboutsummaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorGeorge G. Davis <gdavis@mvista.com>2007-12-01 05:49:41 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-01-26 14:50:04 +0000
commit7b544c99e0328937932022da3cbdd38cf3f072ec (patch)
tree0d004e546f501816d752d744cb73618f6b0e370d /arch
parent[ARM] 4666/1: ixp4xx: fix sparse warnings in include/asm-arm/arch-ixp4xx/io.h (diff)
downloadlinux-dev-7b544c99e0328937932022da3cbdd38cf3f072ec.tar.xz
linux-dev-7b544c99e0328937932022da3cbdd38cf3f072ec.zip
[ARM] 4687/1: Trivial arch/arm/kernel/entry-common.S comment fix
Make the comment match the code Signed-off-by: George G. Davis <gdavis@mvista.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/kernel/entry-common.S2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/kernel/entry-common.S b/arch/arm/kernel/entry-common.S
index 33e6cc2ffd3b..6c90c50a9ee3 100644
--- a/arch/arm/kernel/entry-common.S
+++ b/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