refresh

diff --git a/meta b/meta
index 753526a71e9e4a1a0fa2ec5934f4cfc032aada1e..a1ac266645da24ae41319fa4197dde1e0429e3c6 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: be0734ca347edc568e9854fe5d5ebd8c5e79424c
-Head: d38a322fbaa608020244730906e11d55bfdb9212
+Previous: dc8d6a0dabfc1438650f6e11eacc8e8fcb20dca1
+Head: 0b477b15ac308e22db226f41776eb394deb63b15
 Applied:
-  atomic: 1e95862665a23084eb89522ce5b47ccabf008329
-  refresh-temp: d38a322fbaa608020244730906e11d55bfdb9212
+  atomic: 0b477b15ac308e22db226f41776eb394deb63b15
 Unapplied:
 Hidden:

diff --git a/patches/atomic b/patches/atomic
index e774f403ea3d2a2761b699431a0a5fcc8421c278..a3df170b846be4670db5e35e15afa34bd650f5bb 100644 (file)
--- a/patches/atomic
+++ b/patches/atomic
@@ -1,5 +1,5 @@
 Bottom: 44cd90e52fd7bd946e34e9acdfcf1cef88293c9a
-Top:    b4ed043a0fc86707acda56000b3096e59867bfbe
+Top:    58672dbab4886462dc5ca2664ef7b5725ca5a6d8
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-08-25 10:26:22 -0700
 
@@ -41,28 +41,38 @@ index 997c775..dfddeac
      if test -n "`$LD --help < /dev/null 2>/dev/null | grep version-script`"; then\r
          ac_cv_version_script=yes\r
 diff --git a/linux/osd.h b/linux/osd.h
-index 722e1b1..9dacab9 100644
+index 722e1b1..28c3647 100644
 --- a/linux/osd.h
 +++ b/linux/osd.h
-@@ -65,9 +65,27 @@
+@@ -65,9 +65,37 @@
  #endif\r
  #define ntohll(x) htonll(x)\r
  \r
 +#if DEFINE_ATOMICS\r
 +typedef struct { pthread_mutex_t mut; int val; } atomic_t;\r
-+#define atomic_inc(v) { \\r
-+      int x;\r
-+      pthread_mutex_lock(&(v)->mut); \\r
-+      x = ++val; \\r
-+      pthread_mutex_unlock(&(v)->mut); \\r
-+      return x; }\r
-+#define atomic_dec(v) { \\r
-+      int x;\r
-+      pthread_mutex_lock(&(v)->mut); \\r
-+      x = --val; \\r
-+      pthread_mutex_unlock(&(v)->mut); \\r
-+      return x; }\r
-+#define atomic_init(v) { pthread_mutex_init(&(v)->mut, NULL); (v)->val = 0); }\r
++static inline int atomic_inc(atomic_t *atomic)\r
++{\r
++      int v;\r
++\r
++      pthread_mutex_lock(&atomic->mut);\r
++      v = ++(atomic->val);\r
++      pthread_mutex_unlock(&atomic->mut);\r
++      return v;\r
++}\r
++static inline int atomic_dec(atomic_t *atomic)\r
++{\r
++      int v;\r
++\r
++      pthread_mutex_lock(&atomic->mut);\r
++      v = --(atomic->val);\r
++      pthread_mutex_unlock(&atomic->mut);\r
++      return v;\r
++}\r
++static inline void atomic_init(atomic_t *atomic)\r
++{\r
++      pthread_mutex_init(&atomic->mut, NULL);\r
++      atomic->val = 0;\r
++}\r
 +#else\r
  typedef struct { volatile int val; } atomic_t;\r
 -#define atomic_inc(v) (__sync_fetch_and_add(&(v)->val, 1) + 1)\r

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 680f3c8..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,56 +0,0 @@
-Bottom: b4ed043a0fc86707acda56000b3096e59867bfbe
-Top:    58672dbab4886462dc5ca2664ef7b5725ca5a6d8
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-08-25 17:01:58 -0700
-
-Refresh of atomic
-
----
-
-diff --git a/linux/osd.h b/linux/osd.h
-index 9dacab9..28c3647 100644
---- a/linux/osd.h
-+++ b/linux/osd.h
-@@ -67,19 +67,29 @@
- \r
- #if DEFINE_ATOMICS\r
- typedef struct { pthread_mutex_t mut; int val; } atomic_t;\r
--#define atomic_inc(v) { \\r
--      int x;\r
--      pthread_mutex_lock(&(v)->mut); \\r
--      x = ++val; \\r
--      pthread_mutex_unlock(&(v)->mut); \\r
--      return x; }\r
--#define atomic_dec(v) { \\r
--      int x;\r
--      pthread_mutex_lock(&(v)->mut); \\r
--      x = --val; \\r
--      pthread_mutex_unlock(&(v)->mut); \\r
--      return x; }\r
--#define atomic_init(v) { pthread_mutex_init(&(v)->mut, NULL); (v)->val = 0); }\r
-+static inline int atomic_inc(atomic_t *atomic)\r
-+{\r
-+      int v;\r
-+\r
-+      pthread_mutex_lock(&atomic->mut);\r
-+      v = ++(atomic->val);\r
-+      pthread_mutex_unlock(&atomic->mut);\r
-+      return v;\r
-+}\r
-+static inline int atomic_dec(atomic_t *atomic)\r
-+{\r
-+      int v;\r
-+\r
-+      pthread_mutex_lock(&atomic->mut);\r
-+      v = --(atomic->val);\r
-+      pthread_mutex_unlock(&atomic->mut);\r
-+      return v;\r
-+}\r
-+static inline void atomic_init(atomic_t *atomic)\r
-+{\r
-+      pthread_mutex_init(&atomic->mut, NULL);\r
-+      atomic->val = 0;\r
-+}\r
- #else\r
- typedef struct { volatile int val; } atomic_t;\r
- #define atomic_inc(v) (__sync_add_and_fetch(&(v)->val, 1))