lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
* 'upstream' of git://git.linux-mips.org/pub/scm/upstream-linus:
  MIPS: Fix build errors in sc-mips.c
This commit is contained in:
Linus Torvalds
2010-12-18 10:23:29 -08:00
parent 46bdfe6a50 081d835fa4
commit 2ba16c4f45
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
arch/mips/mm/sc-mips.c
View File

@@ -68,6 +68,9 @@ static struct bcache_ops mips_sc_ops = {
*/ */
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 = read_c0_config2();
unsigned int tmp;
/* Check the bypass bit (L2B) */ /* Check the bypass bit (L2B) */
switch (c->cputype) { switch (c->cputype) {
case CPU_34K: case CPU_34K:
@@ -83,6 +86,7 @@ static inline int mips_sc_is_activated(struct cpuinfo_mips *c)
c->scache.linesz = 2 << tmp; c->scache.linesz = 2 << tmp;
else else
return 0; return 0;
return 1;
} }
static inline int __init mips_sc_probe(void) static inline int __init mips_sc_probe(void)