diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2014-01-13 12:13:05 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2014-01-13 12:13:05 +0000 |
| commit | d8ac24b325a8db1f88c2eeb359ea55e6e53259bb (patch) | |
| tree | 81a585224a19a680d861a282d2bdec9355f28c4d /target/linux/brcm63xx/patches-3.10/068-MIPS-BCM63XX-always-register-bmips-smp-ops.patch | |
| parent | d9a20b6f461c3be0278ab8e05c2338f7b232482f (diff) | |
| download | upstream-d8ac24b325a8db1f88c2eeb359ea55e6e53259bb.tar.gz upstream-d8ac24b325a8db1f88c2eeb359ea55e6e53259bb.tar.bz2 upstream-d8ac24b325a8db1f88c2eeb359ea55e6e53259bb.zip | |
brcm63xx: update bmips patches with upstream submission
Update bmips cleanup patches with upstream submission and backport a few
bmips fixes.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 39267
Diffstat (limited to 'target/linux/brcm63xx/patches-3.10/068-MIPS-BCM63XX-always-register-bmips-smp-ops.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-3.10/068-MIPS-BCM63XX-always-register-bmips-smp-ops.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/target/linux/brcm63xx/patches-3.10/068-MIPS-BCM63XX-always-register-bmips-smp-ops.patch b/target/linux/brcm63xx/patches-3.10/068-MIPS-BCM63XX-always-register-bmips-smp-ops.patch new file mode 100644 index 0000000000..659018505e --- /dev/null +++ b/target/linux/brcm63xx/patches-3.10/068-MIPS-BCM63XX-always-register-bmips-smp-ops.patch @@ -0,0 +1,27 @@ +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 |