From 8afdd403ee03f2fe62d2d660a72d3d23a418142c Mon Sep 17 00:00:00 2001 From: Douglas Leung Date: Thu, 19 Jul 2012 09:11:13 +0200 Subject: [PATCH] --- yaml --- r: 312119 b: refs/heads/master c: dc34b05fea0cc9a869863b929f37f1e8ce30edf4 h: refs/heads/master i: 312117: 9bc93312074f582f75def4b09cc1b4e57c764574 312115: 791efedbb090501547c695d0943faa5e06901279 312111: 80373707189cc7d243778d29f3f0fe3d3c4d6e10 v: v3 --- [refs] | 2 +- trunk/arch/mips/mm/c-r4k.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index ccc50237b921..87e94e998d5d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c022630633624a75b3b58f43dd3c6cc896a56cff +refs/heads/master: dc34b05fea0cc9a869863b929f37f1e8ce30edf4 diff --git a/trunk/arch/mips/mm/c-r4k.c b/trunk/arch/mips/mm/c-r4k.c index e56efd059189..f092c265dc63 100644 --- a/trunk/arch/mips/mm/c-r4k.c +++ b/trunk/arch/mips/mm/c-r4k.c @@ -977,7 +977,7 @@ static void __cpuinit probe_pcache(void) c->icache.linesz = 2 << lsize; else c->icache.linesz = lsize; - c->icache.sets = 64 << ((config1 >> 22) & 7); + c->icache.sets = 32 << (((config1 >> 22) + 1) & 7); c->icache.ways = 1 + ((config1 >> 16) & 7); icache_size = c->icache.sets * @@ -997,7 +997,7 @@ static void __cpuinit probe_pcache(void) c->dcache.linesz = 2 << lsize; else c->dcache.linesz= lsize; - c->dcache.sets = 64 << ((config1 >> 13) & 7); + c->dcache.sets = 32 << (((config1 >> 13) + 1) & 7); c->dcache.ways = 1 + ((config1 >> 7) & 7); dcache_size = c->dcache.sets *