diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-21 16:32:58 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-06-24 08:48:43 +0100 |
| commit | 14cd8fd574bce1cfbe510ccb1f73c7c1024d770f (patch) | |
| tree | d50ddf743969ac54898b3cc3053c52bfa95d1690 /arch/arm/kernel/sleep.S | |
| parent | e8856a8797e76e6883ae81f8f9ecbb231cc535df (diff) | |
| download | talos-obmc-linux-14cd8fd574bce1cfbe510ccb1f73c7c1024d770f.tar.gz talos-obmc-linux-14cd8fd574bce1cfbe510ccb1f73c7c1024d770f.zip | |
ARM: pm: move cpu_init() call into core code
As we have core code dealing with CPU suspend/resume, we can
re-initialize the CPUs exception banked registers via that code rather
than having platforms deal with that level of detail. So, move the
call to cpu_init() out of platform code into core code.
Tested-by: Kevin Hilman <khilman@ti.com>
Acked-by: Jean Pihet <j-pihet@ti.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/kernel/sleep.S')
| -rw-r--r-- | arch/arm/kernel/sleep.S | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S index e0626779fe92..53922748d101 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S @@ -88,6 +88,7 @@ ENDPROC(cpu_resume_turn_mmu_on) cpu_resume_after_mmu: str r5, [r2, r4, lsl #2] @ restore old mapping mcr p15, 0, r0, c1, c0, 0 @ turn on D-cache + bl cpu_init @ restore the und/abt/irq banked regs ldmfd sp!, {r4 - r11, pc} ENDPROC(cpu_resume_after_mmu) |
