From: Jonas Gorski <jogo@openwrt.org>
Date: Wed, 18 Dec 2013 13:12:07 +0000 (+0100)
Subject: MIPS: BCM63XX: always register bmips smp ops
X-Git-Tag: v3.14-rc1~37^2~122
X-Git-Url: https://openfabrics.org/gitweb/?a=commitdiff_plain;h=10102692803530025ee7862e9df300b88187cfd0;p=~emulex%2Finfiniband.git

MIPS: BCM63XX: always register bmips smp ops

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/
---

diff --git a/arch/mips/bcm63xx/prom.c b/arch/mips/bcm63xx/prom.c
index f93f4fc00ca..e1f27d653f6 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