]> git.openfabrics.org - ~emulex/infiniband.git/commitdiff
MIPS: BCM63XX: always register bmips smp ops
authorJonas Gorski <jogo@openwrt.org>
Wed, 18 Dec 2013 13:12:07 +0000 (14:12 +0100)
committerRalf Baechle <ralf@linux-mips.org>
Wed, 22 Jan 2014 19:18:53 +0000 (20:18 +0100)
Use the return value for guarding further SMP setup.

Signed-off-by: Jonas Gorski <jogo@openwrt.org>
Signed-off-by: John Crispin <blogic@openwrt.org>
Patchwork: http://patchwork.linux-mips.org/patch/6249/

arch/mips/bcm63xx/prom.c

index f93f4fc00ca5bedf289d2311bd6c806db6dc58ad..e1f27d653f603d17413b04aa0e9f540f10cf504a 100644 (file)
@@ -59,10 +59,8 @@ void __init prom_init(void)
        /* do low level board init */
        board_prom_init();
 
-       if (IS_ENABLED(CONFIG_CPU_BMIPS4350) && IS_ENABLED(CONFIG_SMP)) {
-               /* set up SMP */
-               register_bmips_smp_ops();
-
+       /* set up SMP */
+       if (!register_bmips_smp_ops()) {
                /*
                 * BCM6328 might not have its second CPU enabled, while BCM3368
                 * and BCM6358 need special handling for their shared TLB, so