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

---
 meta                 |  7 +++----
 patches/counters     |  6 +++---
 patches/refresh-temp | 22 ----------------------
 3 files changed, 6 insertions(+), 29 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index 6d2dfb8..2472256 100644
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 3de453d2e207b918ae2832b9ad47c439a20e759e
-Head: 470130cb035f798b5f4fb7e847435726bc1f17c1
+Previous: e05f6acede769f797ca46c29706732e0469f5d93
+Head: 0807eb0ca9d79773cfc846ed24e708d9a5842164
 Applied:
   deam: 15fcbd5198ba0c15ab4e8fddcdba32c8ef45faf8
   braces: 5fb48c1b8d722b60332f83ca4c8b92b2a7e456a6
-  counters: be2a2124ef6f726cff01ff7733ded8280b24ab06
-  refresh-temp: 470130cb035f798b5f4fb7e847435726bc1f17c1
+  counters: 0807eb0ca9d79773cfc846ed24e708d9a5842164
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c
diff --git a/patches/counters b/patches/counters
index c14a0f1..89fc91b 100644
--- a/patches/counters
+++ b/patches/counters
@@ -1,5 +1,5 @@
 Bottom: fad6610d1d2786b12bafb5cd923f53cfb674ebdb
-Top:    0bfe95529a1fbb432153c9e1d04862c47b412f39
+Top:    2cff1f10bb9b3c74a5f48fbc4c4e8e6ba8b0f971
 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..a4a7743 100644
+index 31014d1..f6dd452 100644
 --- a/src/libacm.c
 +++ b/src/libacm.c
 @@ -36,6 +36,8 @@
@@ -506,7 +506,7 @@ index 31014d1..a4a7743 100644
 +int ib_acm_query_perf(uint64_t **counters, int *count)
 +{
 +	struct acm_msg msg;
-+	struct acm_perf_msg *perf_msg = (struct acm_perf_msg *) msg;
++	struct acm_perf_msg *perf_msg = (struct acm_perf_msg *) &msg;
 +	int ret;
 +
 +	lock_acquire(&lock);
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index c704f28..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: 0bfe95529a1fbb432153c9e1d04862c47b412f39
-Top:    2cff1f10bb9b3c74a5f48fbc4c4e8e6ba8b0f971
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-06-29 00:08:20 -0700
-
-Refresh of counters
-
----
-
-diff --git a/src/libacm.c b/src/libacm.c
-index a4a7743..f6dd452 100644
---- a/src/libacm.c
-+++ b/src/libacm.c
-@@ -317,7 +317,7 @@ out:
- int ib_acm_query_perf(uint64_t **counters, int *count)
- {
- 	struct acm_msg msg;
--	struct acm_perf_msg *perf_msg = (struct acm_perf_msg *) msg;
-+	struct acm_perf_msg *perf_msg = (struct acm_perf_msg *) &msg;
- 	int ret;
- 
- 	lock_acquire(&lock);
-- 
2.41.0