refresh

diff --git a/meta b/meta
index 5b53ecfc9719e88280a66b90535d6aebd4aa3870..fae28ca120549f8778a97f6abede02e8d15d7b84 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: d9f08e132446fe503e3d83b33a797acea0356ef1
-Head: ed195392a336bf9fa201918860312cdc9f57d7cb
+Previous: 0ac74df476fd8c4a3cf787f5c2c00aa74c2559cc
+Head: bb215b17bde143da235235bff27cfeab8fa42bcc
 Applied:
-  atomic: 5e532c37dd8c6b45cf168c670c7d4e9eebc83239
-  refresh-temp: ed195392a336bf9fa201918860312cdc9f57d7cb
+  atomic: bb215b17bde143da235235bff27cfeab8fa42bcc
 Unapplied:
 Hidden:

diff --git a/patches/atomic b/patches/atomic
index e5032e9d36d9397cee34fc23cc1f930d3c4a8e12..e3018914e7f36205625ec46e887186bbc0805123 100644 (file)
--- a/patches/atomic
+++ b/patches/atomic
@@ -1,5 +1,5 @@
 Bottom: 44cd90e52fd7bd946e34e9acdfcf1cef88293c9a
-Top:    82b37f69cd97e9066b5128b783b6674217c7ed45
+Top:    9c0d7b60a142530a1903dedf47aa9e62d53b42ef
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-25 10:26:22 -0700
 
@@ -17,6 +17,21 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
+diff --git a/Makefile.am b/Makefile.am
+index f443091..4bd4bd5 100644
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -2,6 +2,10 @@ INCLUDES = -I$(srcdir)/include -I$(srcdir)/linux
+ 
+ AM_CFLAGS = -g -Wall -D_GNU_SOURCE
+ 
++if DEFINE_ATOMICS
++      AM_CFLAGS += -DDEFINE_ATOMICS
++endif
++
+ bin_PROGRAMS = util/ib_acme
+ sbin_PROGRAMS = svc/ib_acm
+ svc_ib_acm_SOURCES = src/acm.c
 diff --git a/configure.in b/configure.in
 old mode 100644
 new mode 100755

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 55bd8b7..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,24 +0,0 @@
-Bottom: 82b37f69cd97e9066b5128b783b6674217c7ed45
-Top:    9c0d7b60a142530a1903dedf47aa9e62d53b42ef
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-25 12:17:18 -0700
-
-Refresh of atomic
-
----
-
-diff --git a/Makefile.am b/Makefile.am
-index f443091..4bd4bd5 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -2,6 +2,10 @@ INCLUDES = -I$(srcdir)/include -I$(srcdir)/linux
- 
- AM_CFLAGS = -g -Wall -D_GNU_SOURCE
- 
-+if DEFINE_ATOMICS
-+      AM_CFLAGS += -DDEFINE_ATOMICS
-+endif
-+
- bin_PROGRAMS = util/ib_acme
- sbin_PROGRAMS = svc/ib_acm
- svc_ib_acm_SOURCES = src/acm.c