diff options
author | Kevin Cernekee <cernekee@gmail.com> | 2010-11-02 22:28:01 -0700 |
---|---|---|
committer | Ralf Baechle <ralf@linux-mips.org> | 2010-12-17 19:44:35 +0000 |
commit | 081d835fa4ce70ad1e42ac76de850a49e23a1557 (patch) | |
tree | 8d76d9a5276d3eb8f6fc4a0ab3555f3234a48022 /arch | |
parent | c15524a40a1603dc56a8691c4f50172fb86c23d8 (diff) | |
download | linux-stable-081d835fa4ce70ad1e42ac76de850a49e23a1557.tar.gz linux-stable-081d835fa4ce70ad1e42ac76de850a49e23a1557.tar.bz2 linux-stable-081d835fa4ce70ad1e42ac76de850a49e23a1557.zip |
MIPS: Fix build errors in sc-mips.c
Seen with malta_defconfig on Linus' tree:
CC arch/mips/mm/sc-mips.o
arch/mips/mm/sc-mips.c: In function 'mips_sc_is_activated':
arch/mips/mm/sc-mips.c:77: error: 'config2' undeclared (first use in this function)
arch/mips/mm/sc-mips.c:77: error: (Each undeclared identifier is reported only once
arch/mips/mm/sc-mips.c:77: error: for each function it appears in.)
arch/mips/mm/sc-mips.c:81: error: 'tmp' undeclared (first use in this function)
make[2]: *** [arch/mips/mm/sc-mips.o] Error 1
make[1]: *** [arch/mips/mm] Error 2
make: *** [arch/mips] Error 2
[Ralf: Cosmetic changes to minimize the number of arguments passed to
mips_sc_is_activated]
Signed-off-by: Kevin Cernekee <cernekee@gmail.com>
Patchwork: https://patchwork.linux-mips.org/patch/1752/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch')
-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) |