diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 21:27:54 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 21:27:54 +0100 |
| commit | 3ee0fc5ca129cbae81c073756febcb1c552af446 (patch) | |
| tree | 08f061c1ec9e948df760a0746441bec9f290d774 /arch/arm/mm/proc-arm9tdmi.S | |
| parent | ARM: 7194/1: OMAP: Fix build after a merge between v3.2-rc4 and ARM restart c... (diff) | |
| parent | ARM: SMP: use idmap_pgd for mapping MMU enable during secondary booting (diff) | |
| download | linux-3ee0fc5ca129cbae81c073756febcb1c552af446.tar.xz linux-3ee0fc5ca129cbae81c073756febcb1c552af446.zip | |
Merge branch 'kexec/idmap' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Diffstat (limited to 'arch/arm/mm/proc-arm9tdmi.S')
| -rw-r--r-- | arch/arm/mm/proc-arm9tdmi.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-arm9tdmi.S b/arch/arm/mm/proc-arm9tdmi.S index 2120f9e2af7f..8881391dfb9e 100644 --- a/arch/arm/mm/proc-arm9tdmi.S +++ b/arch/arm/mm/proc-arm9tdmi.S @@ -45,8 +45,11 @@ ENTRY(cpu_arm9tdmi_proc_fin) * Params : loc(r0) address to jump to * Purpose : Sets up everything for a reset and jump to the location for soft reset. */ + .pushsection .idmap.text, "ax" ENTRY(cpu_arm9tdmi_reset) mov pc, r0 +ENDPROC(cpu_arm9tdmi_reset) + .popsection __CPUINIT |