summaryrefslogtreecommitdiffstats
path: root/arch/mips/netlogic/xlr/smpboot.S
diff options
context:
space:
mode:
authorJayachandran C <jayachandranc@netlogicmicro.com>2011-06-22 01:37:05 +0530
committerRalf Baechle <ralf@linux-mips.org>2011-10-20 15:00:19 +0100
commita74e33535fa27c758d2a23ebf5f8964bf19940bc (patch)
treebc7b84a1750b74e1d1260a7a6820671ac6daed47 /arch/mips/netlogic/xlr/smpboot.S
parentb77bb37a2ad7689d9ef8048df9cc30ee770f5a94 (diff)
downloadblackbird-op-linux-a74e33535fa27c758d2a23ebf5f8964bf19940bc.tar.gz
blackbird-op-linux-a74e33535fa27c758d2a23ebf5f8964bf19940bc.zip
MIPS:Netlogic:Fix section mismatch warnings.
Add __init and __cpuinit annotation to functions that need it. Signed-off-by: Jayachandran C <jayachandranc@netlogicmicro.com> To: linux-mips@linux-mips.org Patchwork: https://patchwork.linux-mips.org/patch/2535/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/netlogic/xlr/smpboot.S')
-rw-r--r--arch/mips/netlogic/xlr/smpboot.S16
1 files changed, 11 insertions, 5 deletions
diff --git a/arch/mips/netlogic/xlr/smpboot.S b/arch/mips/netlogic/xlr/smpboot.S
index b8e074402c99..8cb7889ce0cc 100644
--- a/arch/mips/netlogic/xlr/smpboot.S
+++ b/arch/mips/netlogic/xlr/smpboot.S
@@ -32,17 +32,19 @@
* IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <linux/init.h>
+
#include <asm/asm.h>
#include <asm/asm-offsets.h>
#include <asm/regdef.h>
#include <asm/mipsregs.h>
-
-/* Don't jump to linux function from Bootloader stack. Change it
- * here. Kernel might allocate bootloader memory before all the CPUs are
- * brought up (eg: Inode cache region) and we better don't overwrite this
- * memory
+/*
+ * Early code for secondary CPUs. This will get them out of the bootloader
+ * code and into linux. Needed because the bootloader area will be taken
+ * and initialized by linux.
*/
+ __CPUINIT
NESTED(prom_pre_boot_secondary_cpus, 16, sp)
.set mips64
mfc0 t0, $15, 1 # read ebase
@@ -73,7 +75,11 @@ NESTED(prom_pre_boot_secondary_cpus, 16, sp)
jr t0
nop
END(prom_pre_boot_secondary_cpus)
+ __FINIT
+/*
+ * NMI code, used for CPU wakeup, copied to reset entry
+ */
NESTED(nlm_boot_smp_nmi, 0, sp)
.set push
.set noat
OpenPOWER on IntegriCloud