kernel: fix bluetooth and zsmalloc for 3.14
[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.13 / 007-MIPS-BCM63XX-disable-SMP-also-on-BCM3368.patch
1 From 8bd8f46cbc709974b26396aa440133db4484015e Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Fri, 28 Jun 2013 00:25:13 +0200
4 Subject: [PATCH V2 01/13] MIPS: BCM63XX: disable SMP also on BCM3368
5
6 BCM3368 has the same shared TLB as BCM6358.
7
8 Signed-off-by: Jonas Gorski <jogo@openwrt.org>
9 ---
10 arch/mips/bcm63xx/prom.c | 8 ++++----
11 1 file changed, 4 insertions(+), 4 deletions(-)
12
13 --- a/arch/mips/bcm63xx/prom.c
14 +++ b/arch/mips/bcm63xx/prom.c
15 @@ -64,9 +64,9 @@ void __init prom_init(void)
16 register_smp_ops(&bmips_smp_ops);
17
18 /*
19 - * BCM6328 might not have its second CPU enabled, while BCM6358
20 - * needs special handling for its shared TLB, so disable SMP
21 - * for now.
22 + * BCM6328 might not have its second CPU enabled, while BCM3368
23 + * and BCM6358 need special handling for their shared TLB, so
24 + * disable SMP for now.
25 */
26 if (BCMCPU_IS_6328()) {
27 reg = bcm_readl(BCM_6328_OTP_BASE +
28 @@ -74,7 +74,7 @@ void __init prom_init(void)
29
30 if (reg & OTP_6328_REG3_TP1_DISABLED)
31 bmips_smp_enabled = 0;
32 - } else if (BCMCPU_IS_6358()) {
33 + } else if (BCMCPU_IS_3368() || BCMCPU_IS_6358()) {
34 bmips_smp_enabled = 0;
35 }
36