mirror of https://github.com/hak5/openwrt.git
28 lines
886 B
Diff
28 lines
886 B
Diff
|
From 08181bee8ee375225129d086656c567022becf41 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jonas Gorski <jogo@openwrt.org>
|
||
|
|
Date: Fri, 28 Jun 2013 00:08:16 +0200
|
||
|
|
Subject: [PATCH V2 09/13] MIPS: BCM63XX: always register bmips smp ops
|
||
|
|
|
||
|
|
Use the return value for guarding further SMP setup.
|
||
|
|
|
||
|
|
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
|
||
|
|
---
|
||
|
|
arch/mips/bcm63xx/prom.c | 6 ++----
|
||
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
--- 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
|