refresh (create temporary patch)

diff --git a/meta b/meta
index 4712198e411680007219a1646834b79717d7e43a..cdcf3fe5010380346e1e72dec482bb03bacd0cf6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,9 +1,10 @@
 Version: 1
-Previous: eb0bf50177120b33734f31ef04a482443904550f
-Head: 4636ac88627e9dd3cf091e76f2e471ce41d6875b
+Previous: 81ed4e2d8085df07144ff630698ad4f946bc91da
+Head: e592b1f7b4973a3d80200a5857c4b0702dec7180
 Applied:
   ex-ib: 56b48d895e0e9077a5066069e227e53ad34e05e0
   use_ib_acm: 4636ac88627e9dd3cf091e76f2e471ce41d6875b
+  refresh-temp: e592b1f7b4973a3d80200a5857c4b0702dec7180
 Unapplied:
   afib: ea79ee5d40967c071a420e282c15a198a434de51
   seterr: 47eb0c419687c2690292c1910acae83a46e5388c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..17a49da
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,47 @@
+Bottom: 08cdb9a8cfd429d8b0018d91813c88ace4431342
+Top:    c27d867ad4aa3272562653403c7f0f0398a62b7c
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2013-06-10 10:56:18 -0700
+
+Refresh of use_ib_acm
+
+---
+
+diff --git a/src/acm.c b/src/acm.c
+index c423bb7..c9ca5b5 100755
+--- a/src/acm.c
++++ b/src/acm.c
+@@ -45,6 +45,7 @@
+ #include <infiniband/ib.h>
+ #include <infiniband/sa.h>
+ 
++#ifdef USE_IB_ACM
+ #include <infiniband/acm.h>
+ 
+ #if DEFINE_ACM_MSG
+@@ -400,3 +401,5 @@ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints)
+       if (af_ib_support && !(hints->ai_flags & RAI_ROUTEONLY) && (*rai)->ai_route_len)
+               ucma_resolve_af_ib(rai);
+ }
++
++#endif /* USE_IB_ACM */
+diff --git a/src/cma.h b/src/cma.h
+index e6fba8b..b575b9b 100644
+--- a/src/cma.h
++++ b/src/cma.h
+@@ -162,9 +162,15 @@ extern int af_ib_support;
+ 
+ #define RAI_ROUTEONLY         0x01000000
+ 
++#ifdef USE_IB_ACM
+ void ucma_ib_init();
+ void ucma_ib_cleanup();
+ void ucma_ib_resolve(struct rdma_addrinfo **rai, struct rdma_addrinfo *hints);
++#else
++#define ucma_ib_init()
++#define ucma_ib_cleanup()
++#define ucma_ib_resolve(x, y)
++#endif
+ 
+ /* Define path record definition if using older version of libibverbs */
+ #ifdef DEFINE_PATH_RECORD