refresh

diff --git a/meta b/meta
index 47df74a38071246a6e45bb2e49bf2d06e1560e90..3809b262d4b901de3873e5fe09c499bc87ebe57c 100644 (file)
--- a/meta
+++ b/meta
@@ -1,11 +1,10 @@
 Version: 1
-Previous: 780fb6945d1e60e6fbb0d5f883ac82cf7c43be81
-Head: 7e49038818bc20b39d07c9e3ebe6705b8153e5f6
+Previous: 8c2dc00406546d5e8dacd7d95c74dc5aab719807
+Head: 50c4373f67227780faa494f4a92867239aaaf2f1
 Applied:
   deam: 3eb8f395f9a52f04c5b408812e743566e6d673fe
   braces: b6e7734ccc3d5e6103ae137025ec71b6bea39a63
-  counters: ff3d79a44beb17d1ba7e3eb724de877ae0eeebb5
-  refresh-temp: 7e49038818bc20b39d07c9e3ebe6705b8153e5f6
+  counters: 50c4373f67227780faa494f4a92867239aaaf2f1
 Unapplied:
   alias: 6f341666bd82212d870b86b7ac9bb298a686ff90
   bldwrn: 754494566259b4da96d1c3d64c836d0fd45c4861

diff --git a/patches/counters b/patches/counters
index 94d59ab55acea827b5398fdd0acc77ee55d3635d..ee9a12b299afb6fb3caf66d696c812fc0ca10059 100644 (file)
--- a/patches/counters
+++ b/patches/counters
@@ -1,5 +1,5 @@
 Bottom: 8c494522d92d53cdd3122c29716c08dda270b21e
-Top:    ed43fb0fa39a4f3f51411e8cb67ee3b7271e74c3
+Top:    c3c2e3b02cd74f01128072b300204a147b5b08c2
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2011-06-27 10:29:36 -0700
 
@@ -296,7 +296,7 @@ index 7b0639a..54b2411 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..d6eadb7 100644
+index d42ba81..3787998 100644
 --- a/src/acme.c
 +++ b/src/acme.c
 @@ -52,8 +52,6 @@ static char *src_addr;
@@ -363,7 +363,7 @@ index d42ba81..d6eadb7 100644
 +                      printf("Failed to query perf data %s\n", strerror(errno));
 +              } else {
 +                      for (i = 0; i < cnt; i++)
-+                              printf("%llu,", counters[i]);
++                              printf("%llu,", (unsigned long long) counters[i]);
 +                      printf("\n");
 +                      ib_acm_free_perf(counters);
 +              }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 653b7d0..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,22 +0,0 @@
-Bottom: ed43fb0fa39a4f3f51411e8cb67ee3b7271e74c3
-Top:    c3c2e3b02cd74f01128072b300204a147b5b08c2
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2011-06-30 10:40:30 -0700
-
-Refresh of counters
-
----
-
-diff --git a/src/acme.c b/src/acme.c
-index d6eadb7..3787998 100644
---- a/src/acme.c
-+++ b/src/acme.c
-@@ -663,7 +663,7 @@ static int query_perf(char *program, char *dest_arg)
-                       printf("Failed to query perf data %s\n", strerror(errno));
-               } else {
-                       for (i = 0; i < cnt; i++)
--                              printf("%llu,", counters[i]);
-+                              printf("%llu,", (unsigned long long) counters[i]);
-                       printf("\n");
-                       ib_acm_free_perf(counters);
-               }