refresh (create temporary patch)

diff --git a/meta b/meta
index 952dca3376c86d6c0fa1e2d59c6eca89002ed6bd..20f060f11b52ad73521df25bb5a9aa895cdac8a2 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,9 @@
 Version: 1
-Previous: 6ddcd316f9815c60684a2744c1400b509ad83679
-Head: b485d53a6b7de6ca95faa59884ce0fba2e539c29
+Previous: c86813ff0fbadbf9569f16cffb8cb9d71ede71a9
+Head: 0980c25d1fd655577daeca37ee5413d0157fb0ef
 Applied:
   rm-ib-var: b485d53a6b7de6ca95faa59884ce0fba2e539c29
+  refresh-temp: 0980c25d1fd655577daeca37ee5413d0157fb0ef
 Unapplied:
   cma-rm-pd: c44b3110a4c065b9209985f74341f48259247f37
   transpose: 84e0beee0d2d3c217cd9703b9e438d25856cacb6

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..3026aed
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,39 @@
+Bottom: 7ec243f3149e9a1ff1d5183f18e30d2458e354d6
+Top:    7683fa697371afc1116e378e4f1b6c848ead85aa
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2012-07-19 10:14:25 -0700
+
+Refresh of rm-ib-var
+
+---
+
+diff --git a/src/cma.c b/src/cma.c
+index 86dd787..bad8bce 100755
+--- a/src/cma.c
++++ b/src/cma.c
+@@ -206,7 +206,7 @@ int ucma_init(void)
+       struct ibv_device **dev_list = NULL;
+       struct cma_device *cma_dev;
+       struct ibv_device_attr attr;
+-      int i, ret, dev_cnt, ib;
++      int i, ret, dev_cnt;
+ 
+       /* Quick check without lock to see if we're already initialized */
+       if (cma_dev_cnt)
+@@ -241,7 +241,7 @@ int ucma_init(void)
+               goto err2;
+       }
+ 
+-      for (i = 0, ib = 0; dev_list[i];) {
++      for (i = 0; dev_list[i];) {
+               cma_dev = &cma_dev_array[i];
+ 
+               cma_dev->guid = ibv_get_device_guid(dev_list[i]);
+@@ -271,7 +271,6 @@ int ucma_init(void)
+               cma_dev->max_qpsize = attr.max_qp_wr;
+               cma_dev->max_initiator_depth = (uint8_t) attr.max_qp_init_rd_atom;
+               cma_dev->max_responder_resources = (uint8_t) attr.max_qp_rd_atom;
+-              ib += (cma_dev->verbs->device->transport_type == IBV_TRANSPORT_IB);
+       }
+ 
+       cma_dev_cnt = dev_cnt;