diff options
| author | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-07 16:06:47 +0530 |
|---|---|---|
| committer | Varun Wadekar <vwadekar@nvidia.com> | 2011-12-13 20:55:52 -0800 |
| commit | 43ac41c21bcb8a8f480b17aec4ab658d388b6098 (patch) | |
| tree | dbf686c4f15a7e7a67fbf9ce1f87c7017abebb78 /arch/arm/kernel | |
| parent | 46c08ea5cb8e40c44a25b91204c09a721c9896fb (diff) | |
Revert "ARM: pm: move cpu_init() call into core code"
This reverts commit 14cd8fd574bce1cfbe510ccb1f73c7c1024d770f.
Conflicts:
arch/arm/kernel/sleep.S
Bug 911002
Change-Id: I814e25bb8c4ae5b5351fd2bec58d57c9d86ef429
Signed-off-by: Varun Wadekar <vwadekar@nvidia.com>
Reviewed-on: http://git-master/r/68652
Reviewed-by: Mayuresh Kulkarni <mkulkarni@nvidia.com>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/sleep.S | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S index dc902f2c6845..e87f5f243012 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S @@ -94,7 +94,6 @@ 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 mov r0, #0 @ return zero on success ldmfd sp!, {r4 - r11, pc} ENDPROC(cpu_resume_after_mmu) |