From: Jonas Gorski Date: Wed, 18 Dec 2013 13:12:07 +0000 (+0100) Subject: MIPS: BCM63XX: always register bmips smp ops X-Git-Tag: next-20140116~105^2^2~120 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=fbbd8d7e35e1c1a4310e6d93d309eccdc660dcb0;p=karo-tx-linux.git MIPS: BCM63XX: always register bmips smp ops Use the return value for guarding further SMP setup. Signed-off-by: Jonas Gorski Acked-by: John Crispin Patchwork: http://patchwork.linux-mips.org/patch/6249/ --- diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c index f93f4fc00ca5..e1f27d653f60 100644 --- a/arch/mips/bcm63xx/prom.c +++ b/arch/mips/bcm63xx/prom.c @@ -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