diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-04-19 15:28:53 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-04-21 10:26:16 -0400 |
| commit | 0a9024e80e85552b21076542355a4f4a7c0b9472 (patch) | |
| tree | f42807b78c0ed70f8a12ac40706c272b2e717c2f | |
| parent | 79403cda37204b06b9f96351a35251ff7d88de4b (diff) | |
ARM: Fix nommu booting
Commit bf35706f3d09 ("ARM: 8314/1: replace PROCINFO embedded branch with
relative offset") broke booting on nommu platforms as it didn't update
the nommu boot code. This patch fixes that oversight.
Fixes: bf35706f3d09 ("ARM: 8314/1: replace PROCINFO embedded branch with relative offset")
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/kernel/head-nommu.S | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/arch/arm/kernel/head-nommu.S b/arch/arm/kernel/head-nommu.S index cc176b67c134..aebfbf79a1a3 100644 --- a/arch/arm/kernel/head-nommu.S +++ b/arch/arm/kernel/head-nommu.S | |||
| @@ -80,9 +80,9 @@ ENTRY(stext) | |||
| 80 | ldr r13, =__mmap_switched @ address to jump to after | 80 | ldr r13, =__mmap_switched @ address to jump to after |
| 81 | @ initialising sctlr | 81 | @ initialising sctlr |
| 82 | adr lr, BSYM(1f) @ return (PIC) address | 82 | adr lr, BSYM(1f) @ return (PIC) address |
| 83 | ARM( add pc, r10, #PROCINFO_INITFUNC ) | 83 | ldr r12, [r10, #PROCINFO_INITFUNC] |
| 84 | THUMB( add r12, r10, #PROCINFO_INITFUNC ) | 84 | add r12, r12, r10 |
| 85 | THUMB( ret r12 ) | 85 | ret r12 |
| 86 | 1: b __after_proc_init | 86 | 1: b __after_proc_init |
| 87 | ENDPROC(stext) | 87 | ENDPROC(stext) |
| 88 | 88 | ||
| @@ -117,9 +117,9 @@ ENTRY(secondary_startup) | |||
| 117 | 117 | ||
| 118 | adr lr, BSYM(__after_proc_init) @ return address | 118 | adr lr, BSYM(__after_proc_init) @ return address |
| 119 | mov r13, r12 @ __secondary_switched address | 119 | mov r13, r12 @ __secondary_switched address |
| 120 | ARM( add pc, r10, #PROCINFO_INITFUNC ) | 120 | ldr r12, [r10, #PROCINFO_INITFUNC] |
| 121 | THUMB( add r12, r10, #PROCINFO_INITFUNC ) | 121 | add r12, r12, r10 |
| 122 | THUMB( ret r12 ) | 122 | ret r12 |
| 123 | ENDPROC(secondary_startup) | 123 | ENDPROC(secondary_startup) |
| 124 | 124 | ||
| 125 | ENTRY(__secondary_switched) | 125 | ENTRY(__secondary_switched) |