refresh (create temporary patch)

diff --git a/meta b/meta
index 672e096b98845d437f5418deb8bb03257a8cb3ee..d2aa833c366015668150db76573b0f6eb3a90e43 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,11 @@
 Version: 1
-Previous: ed0ba9b7dafc30a96685622f25ffdfa800257080
-Head: 77429e641ec865f9123f762fe4a2b38f958b7757
+Previous: 1a794f4fe34d1ba6670e417a2fed361b971d61e4
+Head: 6311cd29949aa7a9752d60543e046d8ecad54261
 Applied:
   deam: 15fcbd5198ba0c15ab4e8fddcdba32c8ef45faf8
   braces: 5fb48c1b8d722b60332f83ca4c8b92b2a7e456a6
   counters: 77429e641ec865f9123f762fe4a2b38f958b7757
+  refresh-temp: 6311cd29949aa7a9752d60543e046d8ecad54261
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c

diff --git a/patches/refresh-temp b/patches/refresh-temp
new file mode 100644 (file)
index 0000000..e5eb8ea
--- /dev/null
+++ b/patches/refresh-temp
@@ -0,0 +1,35 @@
+Bottom: 4e880c751ba52d99f201637395b7a42c35db7d72
+Top:    0bfe95529a1fbb432153c9e1d04862c47b412f39
+Author: Sean Hefty <sean.hefty@intel.com>
+Date:   2011-06-29 00:07:54 -0700
+
+Refresh of counters
+
+---
+
+diff --git a/src/libacm.c b/src/libacm.c
+index 5a0332f..a4a7743 100644
+--- a/src/libacm.c
++++ b/src/libacm.c
+@@ -316,10 +316,8 @@ out:
+ 
+ int ib_acm_query_perf(uint64_t **counters, int *count)
+ {
+-      union {
+-              struct acm_msg msg;
+-              struct acm_perf_msg perf_msg;
+-      };
++      struct acm_msg msg;
++      struct acm_perf_msg *perf_msg = (struct acm_perf_msg *) msg;
+       int ret;
+ 
+       lock_acquire(&lock);
+@@ -347,7 +345,7 @@ int ib_acm_query_perf(uint64_t **counters, int *count)
+               goto out;
+       }
+ 
+-      memcpy(*counters, perf_msg.data, msg.hdr.data[0]);
++      memcpy(*counters, perf_msg->data, msg.hdr.data[0]);
+       *count = msg.hdr.data[0];
+       ret = 0;
+ out: