diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-18 21:23:29 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-12-18 21:23:29 +0300 |
| commit | 2ba16c4f456eb63f54b1d8b065377d41a1cd6a14 (patch) | |
| tree | 9d3ac965a867d5b6e6950dee8efba7cb5d61621d | |
| parent | 46bdfe6a50b88942f5323f837a3afd93a1c86e60 (diff) | |
| parent | 081d835fa4ce70ad1e42ac76de850a49e23a1557 (diff) | |
| download | linux-2ba16c4f456eb63f54b1d8b065377d41a1cd6a14.tar.xz | |
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
| -rw-r--r-- | arch/mips/mm/sc-mips.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/mips/mm/sc-mips.c b/arch/mips/mm/sc-mips.c index 505fecad4684..9cca8de00545 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) |