Blame SOURCES/hwloc-1.7.patch

fa9c97
diff -ru hwloc-1.7-orig/src/topology-gl.c hwloc-1.7/src/topology-gl.c
fa9c97
--- hwloc-1.7-orig/src/topology-gl.c	2013-03-26 21:00:17.000000000 +0100
fa9c97
+++ hwloc-1.7/src/topology-gl.c	2013-04-23 16:18:46.497469010 +0200
fa9c97
@@ -85,12 +85,18 @@
fa9c97
       gpu_number = ptr_binary_data[1];
fa9c97
       free(ptr_binary_data);
fa9c97
 
fa9c97
+#ifdef NV_CTRL_PCI_DOMAIN
fa9c97
+
fa9c97
       /* Gets the ID's of the GPU defined by gpu_number
fa9c97
        * For further details, see the <NVCtrl/NVCtrlLib.h> */
fa9c97
       err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0,
fa9c97
                                         NV_CTRL_PCI_DOMAIN, &nv_ctrl_pci_domain);
fa9c97
       if (!err)
fa9c97
         continue;
fa9c97
+#else
fa9c97
+      nv_ctrl_pci_domain = 0;
fa9c97
+#endif
fa9c97
+
fa9c97
 
fa9c97
       err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0,
fa9c97
                                         NV_CTRL_PCI_BUS, &nv_ctrl_pci_bus);
fa9c97
@@ -102,11 +108,6 @@
fa9c97
       if (!err)
fa9c97
         continue;
fa9c97
 
fa9c97
-      err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0,
fa9c97
-                                        NV_CTRL_PCI_DOMAIN, &nv_ctrl_pci_domain);
fa9c97
-      if (!err)
fa9c97
-        continue;
fa9c97
-
fa9c97
       err = XNVCTRLQueryTargetAttribute(display, NV_CTRL_TARGET_TYPE_GPU, gpu_number, 0,
fa9c97
                                         NV_CTRL_PCI_FUNCTION, &nv_ctrl_pci_func);
fa9c97
       if (!err)
fa9c97
Only in hwloc-1.7/src: .topology-gl.c.swp