diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 15:27:54 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 15:27:54 -0500 |
| commit | 3ee0fc5ca129cbae81c073756febcb1c552af446 (patch) | |
| tree | 08f061c1ec9e948df760a0746441bec9f290d774 /arch/arm/kernel/sleep.S | |
| parent | deee6d5359969a0ce4e2760cfd7b9f379bd5698a (diff) | |
| parent | 4e8ee7de227e3ab9a72040b448ad728c5428a042 (diff) | |
Merge branch 'kexec/idmap' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Diffstat (limited to 'arch/arm/kernel/sleep.S')
| -rw-r--r-- | arch/arm/kernel/sleep.S | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/kernel/sleep.S b/arch/arm/kernel/sleep.S index 020e99c845e7..9e64231c8cfe 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S | |||
| @@ -54,6 +54,7 @@ ENDPROC(cpu_suspend_abort) | |||
| 54 | * r0 = control register value | 54 | * r0 = control register value |
| 55 | */ | 55 | */ |
| 56 | .align 5 | 56 | .align 5 |
| 57 | .pushsection .idmap.text,"ax" | ||
| 57 | ENTRY(cpu_resume_mmu) | 58 | ENTRY(cpu_resume_mmu) |
| 58 | ldr r3, =cpu_resume_after_mmu | 59 | ldr r3, =cpu_resume_after_mmu |
| 59 | mcr p15, 0, r0, c1, c0, 0 @ turn on MMU, I-cache, etc | 60 | mcr p15, 0, r0, c1, c0, 0 @ turn on MMU, I-cache, etc |
| @@ -62,6 +63,7 @@ ENTRY(cpu_resume_mmu) | |||
| 62 | mov r0, r0 | 63 | mov r0, r0 |
| 63 | mov pc, r3 @ jump to virtual address | 64 | mov pc, r3 @ jump to virtual address |
| 64 | ENDPROC(cpu_resume_mmu) | 65 | ENDPROC(cpu_resume_mmu) |
| 66 | .popsection | ||
| 65 | cpu_resume_after_mmu: | 67 | cpu_resume_after_mmu: |
| 66 | bl cpu_init @ restore the und/abt/irq banked regs | 68 | bl cpu_init @ restore the und/abt/irq banked regs |
| 67 | mov r0, #0 @ return zero on success | 69 | mov r0, #0 @ return zero on success |