Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus

* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
MIPS: Fix build errors in sc-mips.c

+4
+4
arch/mips/mm/sc-mips.c
··· 68 68 */ 69 69 static inline int mips_sc_is_activated(struct cpuinfo_mips *c) 70 70 { 71 + unsigned int config2 = read_c0_config2(); 72 + unsigned int tmp; 73 + 71 74 /* Check the bypass bit (L2B) */ 72 75 switch (c->cputype) { 73 76 case CPU_34K: ··· 86 83 c->scache.linesz = 2 << tmp; 87 84 else 88 85 return 0; 86 + return 1; 89 87 } 90 88 91 89 static inline int __init mips_sc_probe(void)