MIPS: Fix build errors in sc-mips.c
PATCH 1/1 MIPS: Fix build errors in sc-mips.c
Seen with malta_defconfig on Linus' tree:
CC arch/mips/mm/sc-mips.oarch/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
Signed-off-by Kevin Cernekee <[email protected]>
--- arch/mips/mm/sc-mips.c | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-)
arch/mips/mm/sc-mips.c +6 -2
@@ -66,8 +66,11 @@ static struct bcache_ops mips_sc_ops = {* 12..15 as implementation defined so below function will eventually have * to be replaced by a platform specific probe. */ -static inline int mips_sc_is_activated (struct cpuinfo_mips *c) +static inline int mips_sc_is_activated (struct cpuinfo_mips *c, +unsigned int 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 )
@@ -108,7 +112,7 @@ static inline int __init mips_sc_probe(void) config2 =read_c0_config2 (); -if (!mips_sc_is_activated (c)) +if (!mips_sc_is_activated (c, config2))return 0 ; tmp = (config2 >>8 ) &0x0f ;
Signature · 1 line
1.7.0.4
Ralf Baechle
AppliedOn Tue, Nov 02, 2010 at 10:28:01PM -0700, Kevin Cernekee wrote:
Thanks, applied.
Ralf