From 0322db7cde58328804d044ab7aa942cb03412abc Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Mon, 19 Mar 2012 16:39:54 +0000 Subject: [PATCH] Bring over r4402 from hwloc trunk. This commit was SVN r26165. The following SVN revisions from the original message are invalid or inconsistent and therefore were not cross-referenced: r4402 --- opal/mca/hwloc/hwloc132/hwloc/src/topology-x86.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/opal/mca/hwloc/hwloc132/hwloc/src/topology-x86.c b/opal/mca/hwloc/hwloc132/hwloc/src/topology-x86.c index 60df5cdcd4..72df56e01b 100644 --- a/opal/mca/hwloc/hwloc132/hwloc/src/topology-x86.c +++ b/opal/mca/hwloc/hwloc132/hwloc/src/topology-x86.c @@ -208,11 +208,12 @@ static void look_proc(struct procinfo *infos, unsigned highest_cpuid, unsigned h cache->linesize = linesize = (ebx & 0xfff) + 1; cache->linepart = linepart = ((ebx >> 12) & 0x3ff) + 1; + ways = ((ebx >> 22) & 0x3ff) + 1; if (eax & (1 << 9)) /* Fully associative */ cache->ways = -1; else - cache->ways = ways = ((ebx >> 22) & 0x3ff) + 1; + cache->ways = ways; cache->sets = sets = ecx + 1; cache->size = linesize * linepart * ways * sets;