diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-20 06:12:24 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-20 06:13:41 +0100 |
| commit | 844e8a16f25568eefd02a6bfb40bdd9bc04704b8 (patch) | |
| tree | fdfe4de420c66517a2e4a2a25a454997c6210e95 /arch/arm/mm/proc-arm926.S | |
| parent | Merge branch 'davinci/cleanup' into next/cleanup (diff) | |
| parent | MAINTAINERS: add maintainer entry for Picochip picoxcell (diff) | |
| download | linux-844e8a16f25568eefd02a6bfb40bdd9bc04704b8.tar.xz linux-844e8a16f25568eefd02a6bfb40bdd9bc04704b8.zip | |
Merge branch 'picoxcell/cleanup' into next/cleanup
* picoxcell/cleanup: (4 commits)
MAINTAINERS: add maintainer entry for Picochip picoxcell
ARM: picoxcell: move io mappings to common.c
ARM: picoxcell: don't reserve irq_descs
ARM: picoxcell: remove mach/memory.h
Conflicts:
arch/arm/mach-at91/setup.c
Diffstat (limited to 'arch/arm/mm/proc-arm926.S')
| -rw-r--r-- | arch/arm/mm/proc-arm926.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-arm926.S b/arch/arm/mm/proc-arm926.S index 9f8fd91f918a..820259b81a1f 100644 --- a/arch/arm/mm/proc-arm926.S +++ b/arch/arm/mm/proc-arm926.S @@ -77,6 +77,7 @@ ENTRY(cpu_arm926_proc_fin) * loc: location to jump to for soft reset */ .align 5 + .pushsection .idmap.text, "ax" ENTRY(cpu_arm926_reset) mov ip, #0 mcr p15, 0, ip, c7, c7, 0 @ invalidate I,D caches @@ -89,6 +90,8 @@ ENTRY(cpu_arm926_reset) bic ip, ip, #0x1100 @ ...i...s........ mcr p15, 0, ip, c1, c0, 0 @ ctrl register mov pc, r0 +ENDPROC(cpu_arm926_reset) + .popsection /* * cpu_arm926_do_idle() |