diff options
author | Olof Johansson <olof@lixom.net> | 2011-12-16 14:50:01 -0800 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2011-12-16 14:50:01 -0800 |
commit | b94ee062b5b41c7fc0e44309e8546d4694e75007 (patch) | |
tree | 2ba08003be8d25a573c17a00a627b424de4bb2e4 /arch/arm/mm/proc-arm940.S | |
parent | dc47ce90c3a822cd7c9e9339fe4d5f61dcb26b50 (diff) | |
parent | 3bdc3484e8f2b1b219ad0397d81ce4601fbaf76d (diff) | |
download | op-kernel-dev-b94ee062b5b41c7fc0e44309e8546d4694e75007.zip op-kernel-dev-b94ee062b5b41c7fc0e44309e8546d4694e75007.tar.gz |
Merge branch 'depends/rmk/devel-stable' into next/boards
Diffstat (limited to 'arch/arm/mm/proc-arm940.S')
-rw-r--r-- | arch/arm/mm/proc-arm940.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-arm940.S b/arch/arm/mm/proc-arm940.S index ac750d5..9fdc0a17 100644 --- a/arch/arm/mm/proc-arm940.S +++ b/arch/arm/mm/proc-arm940.S @@ -48,6 +48,7 @@ ENTRY(cpu_arm940_proc_fin) * Params : r0 = address to jump to * Notes : This sets up everything for a reset */ + .pushsection .idmap.text, "ax" ENTRY(cpu_arm940_reset) mov ip, #0 mcr p15, 0, ip, c7, c5, 0 @ flush I cache @@ -58,6 +59,8 @@ ENTRY(cpu_arm940_reset) bic ip, ip, #0x00001000 @ i-cache mcr p15, 0, ip, c1, c0, 0 @ ctrl register mov pc, r0 +ENDPROC(cpu_arm940_reset) + .popsection /* * cpu_arm940_do_idle() |