diff options
| author | Olof Johansson <olof@lixom.net> | 2011-12-18 05:05:50 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2011-12-18 05:05:50 +0100 |
| commit | d695cfa54e9ec48aeb149cadc8dab1240751572a (patch) | |
| tree | 503d342f303181c4a8e4fb89e070117d5760c513 /arch/arm/mm/proc-arm720.S | |
| parent | arm/tegra: initial device tree for tegra30 (diff) | |
| parent | ARM: kexec: use soft_restart for branching to the reboot buffer (diff) | |
| download | linux-d695cfa54e9ec48aeb149cadc8dab1240751572a.tar.xz linux-d695cfa54e9ec48aeb149cadc8dab1240751572a.zip | |
Merge remote-tracking branch 'rmk/devel-stable' into for-3.3/soc
Conflicts:
arch/arm/mach-tegra/board-dt.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mm/proc-arm720.S')
| -rw-r--r-- | arch/arm/mm/proc-arm720.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-arm720.S b/arch/arm/mm/proc-arm720.S index 55f4e290665a..0ac908c7ade1 100644 --- a/arch/arm/mm/proc-arm720.S +++ b/arch/arm/mm/proc-arm720.S @@ -101,6 +101,7 @@ ENTRY(cpu_arm720_set_pte_ext) * Params : r0 = address to jump to * Notes : This sets up everything for a reset */ + .pushsection .idmap.text, "ax" ENTRY(cpu_arm720_reset) mov ip, #0 mcr p15, 0, ip, c7, c7, 0 @ invalidate cache @@ -112,6 +113,8 @@ ENTRY(cpu_arm720_reset) bic ip, ip, #0x2100 @ ..v....s........ mcr p15, 0, ip, c1, c0, 0 @ ctrl register mov pc, r0 +ENDPROC(cpu_arm720_reset) + .popsection __CPUINIT |