From 5c36c3ce324d5f04f18718d5102dca7436e9c0a3 Mon Sep 17 00:00:00 2001
From: Sean Hefty <sean.hefty@intel.com>
Date: Tue, 28 Jun 2011 23:44:18 -0700
Subject: [PATCH] refresh

---
 meta                 |  7 +++----
 patches/counters     | 11 ++++++-----
 patches/refresh-temp | 21 ---------------------
 3 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 patches/refresh-temp

diff --git a/meta b/meta
index b4e6d97..bc6978f 100644
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: b73586efb69bd63026839525f9c492c1a42f0c36
-Head: 5ead576ac24bd2ed56bc36ab1cab4ed6801a8c81
+Previous: 7df643fa92baef1016954b15a426f6c26dc16948
+Head: 81878eb30604d7b25d0648329ca9e5f3eba591e1
 Applied:
   deam: 15fcbd5198ba0c15ab4e8fddcdba32c8ef45faf8
   braces: 5fb48c1b8d722b60332f83ca4c8b92b2a7e456a6
-  counters: 9e17b4389e12e0de0158ec497f2d056ca3e3ade7
-  refresh-temp: 5ead576ac24bd2ed56bc36ab1cab4ed6801a8c81
+  counters: 81878eb30604d7b25d0648329ca9e5f3eba591e1
 Unapplied:
   acm1.0.5: 1b225173756cfcec4d81d26b1160ebae7644261b
   name2ip: 8e00708e882239292492e13aa51c82042255933c
diff --git a/patches/counters b/patches/counters
index 104c7ec..27f2315 100644
--- a/patches/counters
+++ b/patches/counters
@@ -1,5 +1,5 @@
 Bottom: fad6610d1d2786b12bafb5cd923f53cfb674ebdb
-Top:    703fd4acf706e8f6085cb3aa7bd0d562339dabd7
+Top:    96d4b580e6b64a5b93647bf40210f2a5ee9a6839
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-27 10:29:36 -0700
 
@@ -296,7 +296,7 @@ index 8b01adb..1f9d2e8 100644
  	if (acm_open_devices()) {
  		acm_log(0, "ERROR - unable to open any devices\n");
 diff --git a/src/acme.c b/src/acme.c
-index d42ba81..39ce2dd 100644
+index d42ba81..733170f 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -52,8 +52,6 @@ static char *src_addr;
@@ -391,17 +391,18 @@ index d42ba81..39ce2dd 100644
  		switch (op) {
  		case 'f':
  			addr_type = optarg[0];
-@@ -685,6 +727,9 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -685,6 +727,10 @@ int CDECL_FUNC main(int argc, char **argv)
  		case 'D':
  			dest_dir = optarg;
  			break;
 +		case 'P':
++			perf_query = 1;
 +			dest_arg = optarg;
 +			break;
  		case 'V':
  			verbose = 1;
  			break;
-@@ -700,8 +745,12 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -700,8 +746,12 @@ int CDECL_FUNC main(int argc, char **argv)
  		exit(1);
  	}
  
@@ -416,7 +417,7 @@ index d42ba81..39ce2dd 100644
  
  	if (!ret && make_addr)
  		ret = gen_addr();
-@@ -709,6 +758,7 @@ int CDECL_FUNC main(int argc, char **argv)
+@@ -709,6 +759,7 @@ int CDECL_FUNC main(int argc, char **argv)
  	if (!ret && make_opts)
  		ret = gen_opts();
  
diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644
index 888387d..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,21 +0,0 @@
-Bottom: 703fd4acf706e8f6085cb3aa7bd0d562339dabd7
-Top:    96d4b580e6b64a5b93647bf40210f2a5ee9a6839
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-06-28 23:44:18 -0700
-
-Refresh of counters
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index 39ce2dd..733170f 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -728,6 +728,7 @@ int CDECL_FUNC main(int argc, char **argv)
- 			dest_dir = optarg;
- 			break;
- 		case 'P':
-+			perf_query = 1;
- 			dest_arg = optarg;
- 			break;
- 		case 'V':
-- 
2.46.0