From adb5141e34c4c8b6a9a39fe087433ae8d8c443e6 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Wed, 29 Jun 2011 00:07:54 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 +++----
 patches/counters     | 14 ++++++--------
 patches/refresh-temp | 35 -----------------------------------
 3 files changed, 9 insertions(+), 47 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index d2aa833..b944500 100644
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 1a794f4fe34d1ba6670e417a2fed361b971d61e4
-Head: 6311cd29949aa7a9752d60543e046d8ecad54261
+Previous: 8ac7f19bff59d165b9ae910d91e0f23de63edaf7
+Head: be2a2124ef6f726cff01ff7733ded8280b24ab06
 Applied:
   deam: 15fcbd5198ba0c15ab4e8fddcdba32c8ef45faf8
   braces: 5fb48c1b8d722b60332f83ca4c8b92b2a7e456a6
-  counters: 77429e641ec865f9123f762fe4a2b38f958b7757
-  refresh-temp: 6311cd29949aa7a9752d60543e046d8ecad54261
+  counters: be2a2124ef6f726cff01ff7733ded8280b24ab06
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c
diff --git a/patches/counters b/patches/counters
index 8126842..c14a0f1 100644
--- a/patches/counters
+++ b/patches/counters
@@ -1,5 +1,5 @@
 Bottom: fad6610d1d2786b12bafb5cd923f53cfb674ebdb
-Top:    4e880c751ba52d99f201637395b7a42c35db7d72
+Top:    0bfe95529a1fbb432153c9e1d04862c47b412f39
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-27 10:29:36 -0700
 
@@ -427,7 +427,7 @@ index d42ba81..cf296c6 100644
  	if (verbose || !(make_addr || make_opts) || ret)
  		printf("return status 0x%x\n", ret);
 diff --git a/src/libacm.c b/src/libacm.c
-index 31014d1..5a0332f 100644
+index 31014d1..a4a7743 100644
 --- a/src/libacm.c
 +++ b/src/libacm.c
 @@ -36,6 +36,8 @@
@@ -498,17 +498,15 @@ index 31014d1..5a0332f 100644
  	}
  }
  
-@@ -310,3 +313,44 @@ out:
+@@ -310,3 +313,42 @@ out:
  	lock_release(&lock);
  	return ret;
  }
 +
 +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);
@@ -536,7 +534,7 @@ index 31014d1..5a0332f 100644
 +		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:
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index e5eb8ea..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,35 +0,0 @@
-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:
-- 
2.41.0