diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 20:27:54 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 20:27:54 +0000 |
| commit | 3ee0fc5ca129cbae81c073756febcb1c552af446 (patch) | |
| tree | 08f061c1ec9e948df760a0746441bec9f290d774 /arch/arm/mm/proc-xsc3.S | |
| parent | deee6d5359969a0ce4e2760cfd7b9f379bd5698a (diff) | |
| parent | 4e8ee7de227e3ab9a72040b448ad728c5428a042 (diff) | |
| download | linux-stable-3ee0fc5ca129cbae81c073756febcb1c552af446.tar.gz linux-stable-3ee0fc5ca129cbae81c073756febcb1c552af446.tar.bz2 linux-stable-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-xsc3.S')
| -rw-r--r-- | arch/arm/mm/proc-xsc3.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-xsc3.S b/arch/arm/mm/proc-xsc3.S index abf0507a08ae..b0d57869da2d 100644 --- a/arch/arm/mm/proc-xsc3.S +++ b/arch/arm/mm/proc-xsc3.S @@ -105,6 +105,7 @@ ENTRY(cpu_xsc3_proc_fin) * loc: location to jump to for soft reset */ .align 5 + .pushsection .idmap.text, "ax" ENTRY(cpu_xsc3_reset) mov r1, #PSR_F_BIT|PSR_I_BIT|SVC_MODE msr cpsr_c, r1 @ reset CPSR @@ -119,6 +120,8 @@ ENTRY(cpu_xsc3_reset) @ already containing those two last instructions to survive. mcr p15, 0, ip, c8, c7, 0 @ invalidate I and D TLBs mov pc, r0 +ENDPROC(cpu_xsc3_reset) + .popsection /* * cpu_xsc3_do_idle() |