diff options
| author | Sang-Hun Lee <sanlee@nvidia.com> | 2012-04-16 10:54:50 -0700 |
|---|---|---|
| committer | Rohan Somvanshi <rsomvanshi@nvidia.com> | 2012-04-19 07:41:22 -0700 |
| commit | 1402e0b6a6069de57972e63821fd60e9e9fcc170 (patch) | |
| tree | 650ee2386a2b8e7e74a97615b7c18abf184f092a /arch/arm/kernel | |
| parent | 31e7504b0fd04f47befbd27a767fad785260e4a2 (diff) | |
Revert "ARM: pm: get rid of cpu_resume_turn_mmu_on"
This reverts commit 5682179d980e1a70bcf37fd97a14e27a2ddde822.
Bug 967887
Signed-off-by: Sang-Hun Lee <sanlee@nvidia.com>
Change-Id: Ieb44d89a8361d1fa59b3d6375234f06f57c1c717
Reviewed-on: http://git-master/r/96793
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Varun Wadekar <vwadekar@nvidia.com>
Diffstat (limited to 'arch/arm/kernel')
| -rw-r--r-- | arch/arm/kernel/sleep.S | 8 | ||||
| -rw-r--r-- | arch/arm/kernel/suspend.c | 4 |
2 files changed, 8 insertions, 4 deletions
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S index 54cd05876251..9d403d6c56d3 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S @@ -72,15 +72,19 @@ ENDPROC(cpu_suspend_abort) /* * r0 = control register value */ - .align 5 ENTRY(cpu_resume_mmu) ldr r3, =cpu_resume_after_mmu + b cpu_resume_turn_mmu_on +ENDPROC(cpu_resume_mmu) + .ltorg + .align 5 +ENTRY(cpu_resume_turn_mmu_on) mcr p15, 0, r0, c1, c0, 0 @ turn on MMU, I-cache, etc mrc p15, 0, r0, c0, c0, 0 @ read id reg mov r0, r0 mov r0, r0 mov pc, r3 @ jump to virtual address -ENDPROC(cpu_resume_mmu) +ENDPROC(cpu_resume_turn_mmu_on) cpu_resume_after_mmu: bl cpu_init mov r0, #0 @ return zero on success diff --git a/arch/arm/kernel/suspend.c b/arch/arm/kernel/suspend.c index ed4160b64e66..2beda56e4574 100644 --- a/arch/arm/kernel/suspend.c +++ b/arch/arm/kernel/suspend.c @@ -9,7 +9,7 @@ static pgd_t *suspend_pgd; extern int __cpu_suspend(int, long, unsigned long, int (*)(unsigned long)); -extern void cpu_resume_mmu(void); +extern void cpu_resume_turn_mmu_on(void); /* * Hide the first two arguments to __cpu_suspend - these are an implementation @@ -43,7 +43,7 @@ static int __init cpu_suspend_init(void) { suspend_pgd = pgd_alloc(&init_mm); if (suspend_pgd) { - unsigned long addr = virt_to_phys(cpu_resume_mmu); + unsigned long addr = virt_to_phys(cpu_resume_turn_mmu_on); identity_mapping_add(suspend_pgd, addr, addr + SECTION_SIZE); } return suspend_pgd ? 0 : -ENOMEM; |