diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-08 13:02:04 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-08 13:02:04 -0500 |
| commit | 6ae25a5b9d7ba86d6ac19c403dfa57dae6caa73d (patch) | |
| tree | 41d04269f268d6162e5f1866496dd42fbc79d2a4 /arch/arm/kernel/sleep.S | |
| parent | 3ee0fc5ca129cbae81c073756febcb1c552af446 (diff) | |
| parent | 497b7e943d0dc5743454de56dcdb67352bbf96b2 (diff) | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/cmarinas/linux into devel-stable
Conflicts:
arch/arm/mm/ioremap.c
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 9e64231c8cfe..1f268bda4552 100644 --- a/arch/arm/kernel/sleep.S +++ b/arch/arm/kernel/sleep.S | |||
| @@ -57,8 +57,10 @@ ENDPROC(cpu_suspend_abort) | |||
| 57 | .pushsection .idmap.text,"ax" | 57 | .pushsection .idmap.text,"ax" |
| 58 | ENTRY(cpu_resume_mmu) | 58 | ENTRY(cpu_resume_mmu) |
| 59 | ldr r3, =cpu_resume_after_mmu | 59 | ldr r3, =cpu_resume_after_mmu |
| 60 | instr_sync | ||
| 60 | mcr p15, 0, r0, c1, c0, 0 @ turn on MMU, I-cache, etc | 61 | mcr p15, 0, r0, c1, c0, 0 @ turn on MMU, I-cache, etc |
| 61 | mrc p15, 0, r0, c0, c0, 0 @ read id reg | 62 | mrc p15, 0, r0, c0, c0, 0 @ read id reg |
| 63 | instr_sync | ||
| 62 | mov r0, r0 | 64 | mov r0, r0 |
| 63 | mov r0, r0 | 65 | mov r0, r0 |
| 64 | mov pc, r3 @ jump to virtual address | 66 | mov pc, r3 @ jump to virtual address |