summaryrefslogtreecommitdiffstats
path: root/arch/mips/bcm63xx
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2013-12-18 14:12:01 +0100
committerRalf Baechle <ralf@linux-mips.org>2014-01-22 20:18:51 +0100
commit6465460c92a856f78e1f1b950f9d304ec2661e5a (patch)
treedb0e6f531d656d5dd71174ce7cf4012e5eebb3a4 /arch/mips/bcm63xx
parent68248d0c86c46249336b366baf5547bac68752f0 (diff)
downloadlinux-stable-6465460c92a856f78e1f1b950f9d304ec2661e5a.tar.gz
linux-stable-6465460c92a856f78e1f1b950f9d304ec2661e5a.tar.bz2
linux-stable-6465460c92a856f78e1f1b950f9d304ec2661e5a.zip
MIPS: BMIPS: change compile time checks to runtime checks
Allow building for all bmips cpus at the same time by changing ifdefs to checks for the cpu type, or adding appropriate checks to the assembly. Since BMIPS43XX and BMIPS5000 require different IPI implementations, split the SMP ops into one for each, so the runtime overhead is only at registration time for them. Signed-off-by: Jonas Gorski <jogo@openwrt.org> Signed-off-by: John Crispin <blogic@openwrt.org> Patchwork: http://patchwork.linux-mips.org/patch/6241/
Diffstat (limited to 'arch/mips/bcm63xx')
-rw-r--r--arch/mips/bcm63xx/prom.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c
index 0215849c946e..9872ca34d0c4 100644
--- a/arch/mips/bcm63xx/prom.c
+++ b/arch/mips/bcm63xx/prom.c
@@ -61,7 +61,7 @@ void __init prom_init(void)
if (IS_ENABLED(CONFIG_CPU_BMIPS4350) && IS_ENABLED(CONFIG_SMP)) {
/* set up SMP */
- register_smp_ops(&bmips_smp_ops);
+ register_smp_ops(&bmips43xx_smp_ops);
/*
* BCM6328 might not have its second CPU enabled, while BCM3368