|
 |
28302e |
diff -rup hwloc-1.11.2.bk/src/topology-linux.c hwloc-1.11.2/src/topology-linux.c
|
|
|
28302e |
--- hwloc-1.11.2.bk/src/topology-linux.c 2017-03-24 13:34:08.369114722 -0400
|
|
|
28302e |
+++ hwloc-1.11.2/src/topology-linux.c 2017-03-24 13:34:34.530388408 -0400
|
|
|
28302e |
@@ -4122,7 +4122,8 @@ hwloc_look_linuxfs(struct hwloc_backend
|
|
|
28302e |
}
|
|
|
28302e |
if (cpuvendor && !strcmp(cpuvendor, "GenuineIntel")
|
|
|
28302e |
&& cpufamilynumber && !strcmp(cpufamilynumber, "6")
|
|
|
28302e |
- && cpumodelnumber && !strcmp(cpumodelnumber, "87"))
|
|
|
28302e |
+ && cpumodelnumber && (!strcmp(cpumodelnumber, "87")
|
|
|
28302e |
+ || !strcmp(cpumodelnumber, "133")))
|
|
|
28302e |
data->is_knl = 1;
|
|
|
28302e |
}
|
|
|
28302e |
}
|
|
|
28302e |
Only in hwloc-1.11.2/src: topology-linux.c.orig
|
|
|
28302e |
diff -rup hwloc-1.11.2.bk/src/topology-x86.c hwloc-1.11.2/src/topology-x86.c
|
|
|
28302e |
--- hwloc-1.11.2.bk/src/topology-x86.c 2017-03-24 13:34:08.363114659 -0400
|
|
|
28302e |
+++ hwloc-1.11.2/src/topology-x86.c 2017-03-24 13:34:34.530388408 -0400
|
|
|
28302e |
@@ -174,8 +174,9 @@ static void look_proc(struct hwloc_backe
|
|
|
28302e |
}
|
|
|
28302e |
infos->cpustepping = eax & 0xf;
|
|
|
28302e |
|
|
|
28302e |
- if (cpuid_type == intel && infos->cpufamilynumber == 0x6 && infos->cpumodelnumber == 0x57)
|
|
|
28302e |
- data->is_knl = 1;
|
|
|
28302e |
+ if (cpuid_type == intel && infos->cpufamilynumber == 0x6 &&
|
|
|
28302e |
+ (infos->cpumodelnumber == 0x57 || infos->cpumodelnumber == 0x85))
|
|
|
28302e |
+ data->is_knl = 1; /* KNM is the same as KNL */
|
|
|
28302e |
|
|
|
28302e |
/* Get cpu vendor string from cpuid 0x00 */
|
|
|
28302e |
memset(regs, 0, sizeof(regs));
|
|
|
28302e |
Only in hwloc-1.11.2/src: topology-x86.c.orig
|