summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-12-18 10:23:29 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2010-12-18 10:23:29 -0800
commit2ba16c4f456eb63f54b1d8b065377d41a1cd6a14 (patch)
tree9d3ac965a867d5b6e6950dee8efba7cb5d61621d /arch
parent46bdfe6a50b88942f5323f837a3afd93a1c86e60 (diff)
parent081d835fa4ce70ad1e42ac76de850a49e23a1557 (diff)
downloadlinux-3.10-2ba16c4f456eb63f54b1d8b065377d41a1cd6a14.tar.gz
linux-3.10-2ba16c4f456eb63f54b1d8b065377d41a1cd6a14.tar.bz2
linux-3.10-2ba16c4f456eb63f54b1d8b065377d41a1cd6a14.zip
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
Diffstat (limited to 'arch')
-rw-r--r--arch/mips/mm/sc-mips.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/mm/sc-mips.c b/arch/mips/mm/sc-mips.c
index 505fecad468..9cca8de0054 100644
--- a/arch/mips/mm/sc-mips.c
+++ b/arch/mips/mm/sc-mips.c
@@ -68,6 +68,9 @@ static struct bcache_ops mips_sc_ops = {
*/
static inline int mips_sc_is_activated(struct cpuinfo_mips *c)
{
+ unsigned int config2 = read_c0_config2();
+ unsigned int tmp;
+
/* Check the bypass bit (L2B) */
switch (c->cputype) {
case CPU_34K:
@@ -83,6 +86,7 @@ static inline int mips_sc_is_activated(struct cpuinfo_mips *c)
c->scache.linesz = 2 << tmp;
else
return 0;
+ return 1;
}
static inline int __init mips_sc_probe(void)