kernel: fix bluetooth and zsmalloc for 3.14
[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.13 / 015-MIPS-BCM63XX-always-register-bmips-smp-ops.patch
1 From 08181bee8ee375225129d086656c567022becf41 Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Fri, 28 Jun 2013 00:08:16 +0200
4 Subject: [PATCH V2 09/13] MIPS: BCM63XX: always register bmips smp ops
5
6 Use the return value for guarding further SMP setup.
7
8 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
9 ---
10 arch/mips/bcm63xx/prom.c | 6 ++----
11 1 file changed, 2 insertions(+), 4 deletions(-)
12
13 --- a/arch/mips/bcm63xx/prom.c
14 +++ b/arch/mips/bcm63xx/prom.c
15 @@ -59,10 +59,8 @@ void __init prom_init(void)
16 /* do low level board init */
17 board_prom_init();
18
19 - if (IS_ENABLED(CONFIG_CPU_BMIPS4350) && IS_ENABLED(CONFIG_SMP)) {
20 - /* set up SMP */
21 - register_bmips_smp_ops();
22 -
23 + /* set up SMP */
24 + if (!register_bmips_smp_ops()) {
25 /*
26 * BCM6328 might not have its second CPU enabled, while BCM3368
27 * and BCM6358 need special handling for their shared TLB, so