diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 15:27:54 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-12-06 15:27:54 -0500 |
| commit | 3ee0fc5ca129cbae81c073756febcb1c552af446 (patch) | |
| tree | 08f061c1ec9e948df760a0746441bec9f290d774 /arch/arm/mm/proc-v6.S | |
| parent | deee6d5359969a0ce4e2760cfd7b9f379bd5698a (diff) | |
| parent | 4e8ee7de227e3ab9a72040b448ad728c5428a042 (diff) | |
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-v6.S')
| -rw-r--r-- | arch/arm/mm/proc-v6.S | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mm/proc-v6.S b/arch/arm/mm/proc-v6.S index d061d2fa5506..5900cd520e84 100644 --- a/arch/arm/mm/proc-v6.S +++ b/arch/arm/mm/proc-v6.S | |||
| @@ -55,6 +55,7 @@ ENTRY(cpu_v6_proc_fin) | |||
| 55 | * - loc - location to jump to for soft reset | 55 | * - loc - location to jump to for soft reset |
| 56 | */ | 56 | */ |
| 57 | .align 5 | 57 | .align 5 |
| 58 | .pushsection .idmap.text, "ax" | ||
| 58 | ENTRY(cpu_v6_reset) | 59 | ENTRY(cpu_v6_reset) |
| 59 | mrc p15, 0, r1, c1, c0, 0 @ ctrl register | 60 | mrc p15, 0, r1, c1, c0, 0 @ ctrl register |
| 60 | bic r1, r1, #0x1 @ ...............m | 61 | bic r1, r1, #0x1 @ ...............m |
| @@ -62,6 +63,8 @@ ENTRY(cpu_v6_reset) | |||
| 62 | mov r1, #0 | 63 | mov r1, #0 |
| 63 | mcr p15, 0, r1, c7, c5, 4 @ ISB | 64 | mcr p15, 0, r1, c7, c5, 4 @ ISB |
| 64 | mov pc, r0 | 65 | mov pc, r0 |
| 66 | ENDPROC(cpu_v6_reset) | ||
| 67 | .popsection | ||
| 65 | 68 | ||
| 66 | /* | 69 | /* |
| 67 | * cpu_v6_do_idle() | 70 | * cpu_v6_do_idle() |