From dc56676514d12ffadbf18bff6863ad8f0b3f920e Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 25 Aug 2010 16:08:28 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 ++---
 patches/atomic       | 55 +++++++++++++++++++++++++++++++-----
 patches/refresh-temp | 67 --------------------------------------------
 3 files changed, 51 insertions(+), 78 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index cbc3f7a..2195f54 100644
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 1b6d3820a2adea8b6db044d340ca530058366e27
-Head: bd0346e4080556f8a065dcffb2f6bb61ee0d1359
+Previous: b75334f8dc2448d4cb9bbe148a65b1f19cf2f701
+Head: 7b8e47f55413b6756b2fa378c16f5e21b98f4690
 Applied:
-  atomic: bb215b17bde143da235235bff27cfeab8fa42bcc
-  refresh-temp: bd0346e4080556f8a065dcffb2f6bb61ee0d1359
+  atomic: 7b8e47f55413b6756b2fa378c16f5e21b98f4690
 Unapplied:
 Hidden:
diff --git a/patches/atomic b/patches/atomic
index e301891..6a46e0b 100644
--- a/patches/atomic
+++ b/patches/atomic
@@ -1,5 +1,5 @@
 Bottom: 44cd90e52fd7bd946e34e9acdfcf1cef88293c9a
-Top:    9c0d7b60a142530a1903dedf47aa9e62d53b42ef
+Top:    59952986bf11b417c6da864108e5278e0fbca08a
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-25 10:26:22 -0700
 
@@ -35,7 +35,7 @@ index f443091..4bd4bd5 100644
 diff --git a/configure.in b/configure.in
 old mode 100644
 new mode 100755
-index 997c775..28f98ed
+index 997c775..ce55f75
 --- a/configure.in
 +++ b/configure.in
 @@ -39,6 +39,19 @@ AC_CHECK_HEADER(infiniband/umad.h, [],
@@ -52,7 +52,7 @@ index 997c775..28f98ed
 +    AC_MSG_RESULT(yes),
 +    [
 +        AC_MSG_RESULT(no - defining atomics)
-+        AC_DEFINE(DEFINE_ATOMICS, [], [defining atomics])
++        AC_DEFINE(DEFINE_ATOMICS, [], [Set to 1 to implement atomics])
 +    ])
 +
  AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
@@ -93,10 +93,21 @@ index 722e1b1..9a167a7 100644
  #define atomic_set(v, s) ((v)->val = s)
  
 diff --git a/src/acm.c b/src/acm.c
-index 7c8b84b..56fbb01 100644
+index 7c8b84b..820365c 100644
 --- a/src/acm.c
 +++ b/src/acm.c
-@@ -268,6 +268,7 @@ acm_init_dest(struct acm_dest *dest, uint8_t addr_type, uint8_t *addr, size_t si
+@@ -27,6 +27,10 @@
+  * SOFTWARE.
+  */
+ 
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif /* HAVE_CONFIG_H */
++
+ #include <stdio.h>
+ #include <stdarg.h>
+ #include <string.h>
+@@ -268,6 +272,7 @@ acm_init_dest(struct acm_dest *dest, uint8_t addr_type, uint8_t *addr, size_t si
  	memcpy(dest->address, addr, size);
  	dest->addr_type = addr_type;
  	DListInit(&dest->req_queue);
@@ -104,7 +115,7 @@ index 7c8b84b..56fbb01 100644
  	atomic_set(&dest->refcnt, 1);
  	lock_init(&dest->lock);
  }
-@@ -1560,6 +1561,7 @@ static void acm_init_server(void)
+@@ -1560,6 +1565,7 @@ static void acm_init_server(void)
  		lock_init(&client[i].lock);
  		client[i].index = i;
  		client[i].sock = INVALID_SOCKET;
@@ -112,7 +123,7 @@ index 7c8b84b..56fbb01 100644
  	}
  }
  
-@@ -2680,6 +2682,8 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -2680,6 +2686,8 @@ int CDECL_FUNC main(int argc, char **argv)
  	acm_log(0, "Assistant to the InfiniBand Communication Manager\n");
  	acm_log_options();
  
@@ -121,6 +132,36 @@ index 7c8b84b..56fbb01 100644
  	DListInit(&dev_list);
  	DListInit(&timeout_list);
  	event_init(&timeout_event);
+diff --git a/src/acme.c b/src/acme.c
+index 7428a57..e03679f 100644
+--- a/src/acme.c
++++ b/src/acme.c
+@@ -27,6 +27,10 @@
+  * SOFTWARE.
+  */
+ 
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif /* HAVE_CONFIG_H */
++
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
+diff --git a/src/libacm.c b/src/libacm.c
+index 32fd7e2..9d56cd2 100644
+--- a/src/libacm.c
++++ b/src/libacm.c
+@@ -27,6 +27,10 @@
+  * SOFTWARE.
+  */
+ 
++#if HAVE_CONFIG_H
++#  include <config.h>
++#endif /* HAVE_CONFIG_H */
++
+ #include <osd.h>
+ #include "libacm.h"
+ #include <infiniband/acm.h>
 diff --git a/windows/osd.h b/windows/osd.h
 index 10e5e18..9587c51 100644
 --- a/windows/osd.h
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index a5de81f..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,67 +0,0 @@
-Bottom: 9c0d7b60a142530a1903dedf47aa9e62d53b42ef
-Top:    59952986bf11b417c6da864108e5278e0fbca08a
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-25 16:08:28 -0700
-
-Refresh of atomic
-
----
-
-diff --git a/configure.in b/configure.in
-index 28f98ed..ce55f75 100755
---- a/configure.in
-+++ b/configure.in
-@@ -49,7 +49,7 @@ AC_TRY_LINK([],
-     AC_MSG_RESULT(yes),
-     [
-         AC_MSG_RESULT(no - defining atomics)
--        AC_DEFINE(DEFINE_ATOMICS, [], [defining atomics])
-+        AC_DEFINE(DEFINE_ATOMICS, [], [Set to 1 to implement atomics])
-     ])
- 
- AC_CACHE_CHECK(whether ld accepts --version-script, ac_cv_version_script,
-diff --git a/src/acm.c b/src/acm.c
-index 56fbb01..820365c 100644
---- a/src/acm.c
-+++ b/src/acm.c
-@@ -27,6 +27,10 @@
-  * SOFTWARE.
-  */
- 
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
- #include <stdio.h>
- #include <stdarg.h>
- #include <string.h>
-diff --git a/src/acme.c b/src/acme.c
-index 7428a57..e03679f 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -27,6 +27,10 @@
-  * SOFTWARE.
-  */
- 
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-diff --git a/src/libacm.c b/src/libacm.c
-index 32fd7e2..9d56cd2 100644
---- a/src/libacm.c
-+++ b/src/libacm.c
-@@ -27,6 +27,10 @@
-  * SOFTWARE.
-  */
- 
-+#if HAVE_CONFIG_H
-+#  include <config.h>
-+#endif /* HAVE_CONFIG_H */
-+
- #include <osd.h>
- #include "libacm.h"
- #include <infiniband/acm.h>
-- 
2.41.0