summaryrefslogtreecommitdiff
path: root/target/linux/patches/3.0.25/mips-malta.patch
diff options
context:
space:
mode:
authorWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-06-02 19:56:56 +0200
committerWaldemar Brodkorb <mail@waldemar-brodkorb.de>2012-06-02 19:56:56 +0200
commitd8f493384b36672dd6fd35356ea122f30bdf56e1 (patch)
tree580d84c4cd51f19138cf5876c5448e91dbb8be52 /target/linux/patches/3.0.25/mips-malta.patch
parentf516fba11d74ea04677642e9681d208a920cb686 (diff)
update to latest stable kernels
Diffstat (limited to 'target/linux/patches/3.0.25/mips-malta.patch')
-rw-r--r--target/linux/patches/3.0.25/mips-malta.patch135
1 files changed, 0 insertions, 135 deletions
diff --git a/target/linux/patches/3.0.25/mips-malta.patch b/target/linux/patches/3.0.25/mips-malta.patch
deleted file mode 100644
index cc8789dca..000000000
--- a/target/linux/patches/3.0.25/mips-malta.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-http://lkml.indiana.edu/hypermail/linux/kernel/1105.3/02199.html
-
-diff -Nur linux-2.6.39.orig/arch/mips/include/asm/smp-ops.h linux-2.6.39/arch/mips/include/asm/smp-ops.h
---- linux-2.6.39.orig/arch/mips/include/asm/smp-ops.h 2011-05-19 06:06:34.000000000 +0200
-+++ linux-2.6.39/arch/mips/include/asm/smp-ops.h 2011-08-29 04:39:03.360480881 +0200
-@@ -56,8 +56,43 @@
-
- #endif /* !CONFIG_SMP */
-
--extern struct plat_smp_ops up_smp_ops;
--extern struct plat_smp_ops cmp_smp_ops;
--extern struct plat_smp_ops vsmp_smp_ops;
-+static inline int register_up_smp_ops(void)
-+{
-+#ifdef CONFIG_SMP_UP
-+ extern struct plat_smp_ops up_smp_ops;
-+
-+ register_smp_ops(&up_smp_ops);
-+
-+ return 0;
-+#else
-+ return -ENODEV;
-+#endif
-+}
-+
-+static inline int register_cmp_smp_ops(void)
-+{
-+#ifdef CONFIG_MIPS_CMP
-+ extern struct plat_smp_ops cmp_smp_ops;
-+
-+ register_smp_ops(&cmp_smp_ops);
-+
-+ return 0;
-+#else
-+ return -ENODEV;
-+#endif
-+}
-+
-+static inline int register_vsmp_smp_ops(void)
-+{
-+#ifdef CONFIG_MIPS_MT_SMP
-+ extern struct plat_smp_ops vsmp_smp_ops;
-+
-+ register_smp_ops(&vsmp_smp_ops);
-+
-+ return 0;
-+#else
-+ return -ENODEV;
-+#endif
-+}
-
- #endif /* __ASM_SMP_OPS_H */
-diff -Nur linux-2.6.39.orig/arch/mips/mipssim/sim_setup.c linux-2.6.39/arch/mips/mipssim/sim_setup.c
---- linux-2.6.39.orig/arch/mips/mipssim/sim_setup.c 2011-05-19 06:06:34.000000000 +0200
-+++ linux-2.6.39/arch/mips/mipssim/sim_setup.c 2011-08-29 04:39:03.390480572 +0200
-@@ -59,18 +59,17 @@
-
- prom_meminit();
-
--#ifdef CONFIG_MIPS_MT_SMP
-- if (cpu_has_mipsmt)
-- register_smp_ops(&vsmp_smp_ops);
-- else
-- register_smp_ops(&up_smp_ops);
--#endif
-+ if (cpu_has_mipsmt) {
-+ if (!register_vsmp_smp_ops())
-+ return;
-+
- #ifdef CONFIG_MIPS_MT_SMTC
-- if (cpu_has_mipsmt)
- register_smp_ops(&ssmtc_smp_ops);
-- else
-- register_smp_ops(&up_smp_ops);
-+ return;
- #endif
-+ }
-+
-+ register_up_smp_ops();
- }
-
- static void __init serial_init(void)
-diff -Nur linux-2.6.39.orig/arch/mips/mti-malta/malta-init.c linux-2.6.39/arch/mips/mti-malta/malta-init.c
---- linux-2.6.39.orig/arch/mips/mti-malta/malta-init.c 2011-05-19 06:06:34.000000000 +0200
-+++ linux-2.6.39/arch/mips/mti-malta/malta-init.c 2011-08-29 04:39:03.700480601 +0200
-@@ -29,6 +29,7 @@
- #include <asm/system.h>
- #include <asm/cacheflush.h>
- #include <asm/traps.h>
-+#include <asm/smp-ops.h>
-
- #include <asm/gcmpregs.h>
- #include <asm/mips-boards/prom.h>
-@@ -358,15 +359,14 @@
- #ifdef CONFIG_SERIAL_8250_CONSOLE
- console_config();
- #endif
--#ifdef CONFIG_MIPS_CMP
- /* Early detection of CMP support */
- if (gcmp_probe(GCMP_BASE_ADDR, GCMP_ADDRSPACE_SZ))
-- register_smp_ops(&cmp_smp_ops);
-- else
--#endif
--#ifdef CONFIG_MIPS_MT_SMP
-- register_smp_ops(&vsmp_smp_ops);
--#endif
-+ if (!register_cmp_smp_ops())
-+ return;
-+
-+ if (!register_vsmp_smp_ops())
-+ return;
-+
- #ifdef CONFIG_MIPS_MT_SMTC
- register_smp_ops(&msmtc_smp_ops);
- #endif
-diff -Nur linux-2.6.39.orig/arch/mips/pmc-sierra/msp71xx/msp_setup.c linux-2.6.39/arch/mips/pmc-sierra/msp71xx/msp_setup.c
---- linux-2.6.39.orig/arch/mips/pmc-sierra/msp71xx/msp_setup.c 2011-05-19 06:06:34.000000000 +0200
-+++ linux-2.6.39/arch/mips/pmc-sierra/msp71xx/msp_setup.c 2011-08-29 04:39:03.790480302 +0200
-@@ -228,13 +228,11 @@
- */
- msp_serial_setup();
-
--#ifdef CONFIG_MIPS_MT_SMP
-- register_smp_ops(&vsmp_smp_ops);
--#endif
--
-+ if (register_vsmp_smp_ops()) {
- #ifdef CONFIG_MIPS_MT_SMTC
-- register_smp_ops(&msp_smtc_smp_ops);
-+ register_smp_ops(&msp_smtc_smp_ops);
- #endif
-+ }
-
- #ifdef CONFIG_PMCTWILED
- /*