From 28302e7f16e477f6696d44b16cae7e70b65e8f47 Mon Sep 17 00:00:00 2001
From: CentOS Sources <bugs@centos.org>
Date: Aug 01 2017 03:38:51 +0000
Subject: import hwloc-1.11.2-2.el7


---

diff --git a/SOURCES/hwloc-1.11.5-Add-Knights-Mill-KNM-CPUID.patch b/SOURCES/hwloc-1.11.5-Add-Knights-Mill-KNM-CPUID.patch
new file mode 100644
index 0000000..6e973fe
--- /dev/null
+++ b/SOURCES/hwloc-1.11.5-Add-Knights-Mill-KNM-CPUID.patch
@@ -0,0 +1,30 @@
+diff -rup hwloc-1.11.2.bk/src/topology-linux.c hwloc-1.11.2/src/topology-linux.c
+--- hwloc-1.11.2.bk/src/topology-linux.c	2017-03-24 13:34:08.369114722 -0400
++++ hwloc-1.11.2/src/topology-linux.c	2017-03-24 13:34:34.530388408 -0400
+@@ -4122,7 +4122,8 @@ hwloc_look_linuxfs(struct hwloc_backend
+       }
+       if (cpuvendor && !strcmp(cpuvendor, "GenuineIntel")
+ 	  && cpufamilynumber && !strcmp(cpufamilynumber, "6")
+-	  && cpumodelnumber && !strcmp(cpumodelnumber, "87"))
++	  && cpumodelnumber && (!strcmp(cpumodelnumber, "87")
++	  || !strcmp(cpumodelnumber, "133")))
+ 	data->is_knl = 1;
+     }
+   }
+Only in hwloc-1.11.2/src: topology-linux.c.orig
+diff -rup hwloc-1.11.2.bk/src/topology-x86.c hwloc-1.11.2/src/topology-x86.c
+--- hwloc-1.11.2.bk/src/topology-x86.c	2017-03-24 13:34:08.363114659 -0400
++++ hwloc-1.11.2/src/topology-x86.c	2017-03-24 13:34:34.530388408 -0400
+@@ -174,8 +174,9 @@ static void look_proc(struct hwloc_backe
+   }
+   infos->cpustepping = eax & 0xf;
+ 
+-  if (cpuid_type == intel && infos->cpufamilynumber == 0x6 && infos->cpumodelnumber == 0x57)
+-    data->is_knl = 1;
++  if (cpuid_type == intel && infos->cpufamilynumber == 0x6 &&
++      (infos->cpumodelnumber == 0x57 || infos->cpumodelnumber == 0x85))
++    data->is_knl = 1; /* KNM is the same as KNL */
+ 
+   /* Get cpu vendor string from cpuid 0x00 */
+   memset(regs, 0, sizeof(regs));
+Only in hwloc-1.11.2/src: topology-x86.c.orig
diff --git a/SPECS/hwloc.spec b/SPECS/hwloc.spec
index b05b4fb..71369f7 100644
--- a/SPECS/hwloc.spec
+++ b/SPECS/hwloc.spec
@@ -1,7 +1,7 @@
 Summary:   Portable Hardware Locality - portable abstraction of hierarchical architectures
 Name:      hwloc
 Version:   1.11.2
-Release:   1%{?dist}
+Release:   2%{?dist}
 License:   BSD
 Group:     Applications/System
 URL:       http://www.open-mpi.org/projects/hwloc/
@@ -12,6 +12,7 @@ Patch2:    hwloc-1.11.2-dump-remove-hardwire.patch
 Patch3:    hwloc-1.11.2-dump-cleanups.patch
 Patch4:    hwloc-1.11.2-dump-remove-stop.patch
 Patch5:    hwloc-1.11.2-hwloc-dump-x86-only.patch
+Patch6:    hwloc-1.11.5-Add-Knights-Mill-KNM-CPUID.patch
 
 Requires:  %{name}-libs = %{version}-%{release} 
 
@@ -81,6 +82,7 @@ Requires:  %{name}-plugins = %{version}-%{release}
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
+%patch6 -p1
 
 %build
 autoreconf --force --install
@@ -165,6 +167,10 @@ mkdir -p %{buildroot}%{_unitdir}
 
 
 %changelog
+* Fri Mar 24 2017 Don Zickus <dzickus@redhat.com> - 1.11.2-2
+- Add support for Knights Mill
+  Resolves: rhbz1381313
+
 * Fri Jul  1 2016 Don Zickus <dzickus@redhat.com> - 1.11.2-1
 - Rebase to 1.11.2
 - Xeon Phi dump support