1 files changed, 8 insertions, 0 deletions

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 234c7f5005fb..c8c47a2d1972 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -922,6 +922,14 @@ __init void cpu_probe(void)
         default:
                 c->cputype = CPU_UNKNOWN;
         }
+
+        /*
+         * Platform code can force the cpu type to optimize code
+         * generation. In that case be sure the cpu type is correctly
+         * manually setup otherwise it could trigger some nasty bugs.
+         */
+        BUG_ON(current_cpu_type() != c->cputype);
+
         if (c->options & MIPS_CPU_FPU) {
                 c->fpu_id = cpu_get_fpu_id();