projects
/
deliverable
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm/dt: Allow CONFIG_OF on ARM
[deliverable/linux.git]
/
arch
/
arm
/
kernel
/
sleep.S
diff --git
a/arch/arm/kernel/sleep.S
b/arch/arm/kernel/sleep.S
index bfad698a02e75a3e4e34069a5b67e580e7edc3a4..6398ead9d1c08da1774dba4568a04e22fe4125ae 100644
(file)
--- a/
arch/arm/kernel/sleep.S
+++ b/
arch/arm/kernel/sleep.S
@@
-119,11
+119,19
@@
ENTRY(cpu_resume)
#else
ldr r0, sleep_save_sp @ stack phys addr
#endif
#else
ldr r0, sleep_save_sp @ stack phys addr
#endif
-
msr cpsr_c, #PSR_I_BIT | PSR_F_BIT | SVC_MODE
@ set SVC, irqs off
+
setmode PSR_I_BIT | PSR_F_BIT | SVC_MODE, r1
@ set SVC, irqs off
#ifdef MULTI_CPU
#ifdef MULTI_CPU
- ldmia r0!, {r1, sp, lr, pc} @ load v:p, stack, return fn, resume fn
+ @ load v:p, stack, return fn, resume fn
+ ARM( ldmia r0!, {r1, sp, lr, pc} )
+THUMB( ldmia r0!, {r1, r2, r3, r4} )
+THUMB( mov sp, r2 )
+THUMB( mov lr, r3 )
+THUMB( bx r4 )
#else
#else
- ldmia r0!, {r1, sp, lr} @ load v:p, stack, return fn
+ @ load v:p, stack, return fn
+ ARM( ldmia r0!, {r1, sp, lr} )
+THUMB( ldmia r0!, {r1, r2, lr} )
+THUMB( mov sp, r2 )
b cpu_do_resume
#endif
ENDPROC(cpu_resume)
b cpu_do_resume
#endif
ENDPROC(cpu_resume)
This page took
0.030013 seconds
and
5
git commands to generate.