Merge branch 'from-linus' into upstream

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index ba08f055feb2..aa2caa67299a 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -459,7 +459,7 @@ static inline unsigned int decode_config0(struct cpuinfo_mips *c)
         isa = (config0 & MIPS_CONF_AT) >> 13;
         switch (isa) {
         case 0:
-                switch ((config0 >> 10) & 7) {
+                switch ((config0 & MIPS_CONF_AR) >> 10) {
                 case 0:
                         c->isa_level = MIPS_CPU_ISA_M32R1;
                         break;
@@ -471,7 +471,7 @@ static inline unsigned int decode_config0(struct cpuinfo_mips *c)
                 }
                 break;
         case 2:
-                switch ((config0 >> 10) & 7) {
+                switch ((config0 & MIPS_CONF_AR) >> 10) {
                 case 0:
                         c->isa_level = MIPS_CPU_ISA_M64R1;
                         break;
@@ -548,7 +548,7 @@ static inline unsigned int decode_config3(struct cpuinfo_mips *c)
         return config3 & MIPS_CONF_M;
 }
 
-static inline void decode_configs(struct cpuinfo_mips *c)
+static void __init decode_configs(struct cpuinfo_mips *c)
 {
         /* MIPS32 or MIPS64 compliant CPU.  */
         c->options = MIPS_CPU_4KEX | MIPS_CPU_4K_CACHE | MIPS_CPU_COUNTER |