diff options
author | Jonas Gorski <jogo@openwrt.org> | 2014-08-01 21:56:35 +0000 |
---|---|---|
committer | Jonas Gorski <jogo@openwrt.org> | 2014-08-01 21:56:35 +0000 |
commit | faa51b307cfdbec28f474b48699358064e0f99c7 (patch) | |
tree | 00464a0e64ab7da443068b24b5b44050647e2369 /target/linux/brcm63xx/patches-3.10/068-MIPS-BCM63XX-always-register-bmips-smp-ops.patch | |
parent | 701e2a38fef4fce862eaeb21fc97874a6387a569 (diff) | |
download | upstream-faa51b307cfdbec28f474b48699358064e0f99c7.tar.gz upstream-faa51b307cfdbec28f474b48699358064e0f99c7.tar.bz2 upstream-faa51b307cfdbec28f474b48699358064e0f99c7.zip |
brcm63xx: switch to 3.14
Now that BB is branched off, we can now switch to 3.14 and start
breaking stuff again.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 41941
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, 0 insertions, 27 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 deleted file mode 100644 index 659018505e..0000000000 --- a/target/linux/brcm63xx/patches-3.10/068-MIPS-BCM63XX-always-register-bmips-smp-ops.patch +++ /dev/null @@ -1,27 +0,0 @@ -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 |