diff options
| author | Mark Brown <broonie@linaro.org> | 2014-05-16 15:36:15 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@linaro.org> | 2014-05-16 15:36:15 +0100 |
| commit | 6b8b8223b534f121c546d3f9d1605ee75fac1f85 (patch) | |
| tree | de491e6290b3b7308ff075e5b451e4ce0175dd6f /arch/arm64/kernel/head.S | |
| parent | 8751cf9a6c5f5bf02a2de8a4c025e09b38556df4 (diff) | |
| parent | 5066e800ba3438724f7541c284d674acd9909ba6 (diff) | |
Merge remote-tracking branch 'lsk/v3.10/topic/arm64-cpu' into lsk-v3.10-arm64-misc
Conflicts:
arch/arm64/kernel/smp.c
Diffstat (limited to 'arch/arm64/kernel/head.S')
| -rw-r--r-- | arch/arm64/kernel/head.S | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm64/kernel/head.S b/arch/arm64/kernel/head.S index 7090c126797c..bf7efdf2d7e7 100644 --- a/arch/arm64/kernel/head.S +++ b/arch/arm64/kernel/head.S @@ -225,7 +225,6 @@ ENTRY(__boot_cpu_mode) .quad PAGE_OFFSET #ifdef CONFIG_SMP - .pushsection .smp.pen.text, "ax" .align 3 1: .quad . .quad secondary_holding_pen_release @@ -250,7 +249,16 @@ pen: ldr x4, [x3] wfe b pen ENDPROC(secondary_holding_pen) - .popsection + + /* + * Secondary entry point that jumps straight into the kernel. Only to + * be used where CPUs are brought online dynamically by the kernel. + */ +ENTRY(secondary_entry) + bl __calc_phys_offset // x2=phys offset + bl el2_setup // Drop to EL1 + b secondary_startup +ENDPROC(secondary_entry) ENTRY(secondary_startup) /* |