From 1d900fb7f1d3fd2dae101ad2eb805dab4624e3c8 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 18 Jan 2013 17:05:09 -0300
Subject: [PATCH] --- yaml --- r: 349978 b: refs/heads/master c:
 ab1bf653220b37927b838df81042c8355d20bc49 h: refs/heads/master v: v3

---
 [refs]                      |  2 +-
 trunk/tools/perf/util/pmu.c | 14 +++++++++++++-
 trunk/tools/perf/util/pmu.h | 13 -------------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/[refs] b/[refs]
index 3357be543f2b..8c78b2a1f2d8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: be651ed98dd362fa4151f49f917c74e9e8da88ac
+refs/heads/master: ab1bf653220b37927b838df81042c8355d20bc49
diff --git a/trunk/tools/perf/util/pmu.c b/trunk/tools/perf/util/pmu.c
index 244edbbe1969..4c6f9c490a8d 100644
--- a/trunk/tools/perf/util/pmu.c
+++ b/trunk/tools/perf/util/pmu.c
@@ -1,4 +1,3 @@
-
 #include <linux/list.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -11,6 +10,19 @@
 #include "parse-events.h"
 #include "cpumap.h"
 
+struct perf_pmu_alias {
+	char *name;
+	struct list_head terms;
+	struct list_head list;
+};
+
+struct perf_pmu_format {
+	char *name;
+	int value;
+	DECLARE_BITMAP(bits, PERF_PMU_FORMAT_BITS);
+	struct list_head list;
+};
+
 #define EVENT_SOURCE_DEVICE_PATH "/bus/event_source/devices/"
 
 int perf_pmu_parse(struct list_head *list, char *name);
diff --git a/trunk/tools/perf/util/pmu.h b/trunk/tools/perf/util/pmu.h
index e881dd180acb..32fe55b659fa 100644
--- a/trunk/tools/perf/util/pmu.h
+++ b/trunk/tools/perf/util/pmu.h
@@ -12,19 +12,6 @@ enum {
 
 #define PERF_PMU_FORMAT_BITS 64
 
-struct perf_pmu_format {
-	char *name;
-	int value;
-	DECLARE_BITMAP(bits, PERF_PMU_FORMAT_BITS);
-	struct list_head list;
-};
-
-struct perf_pmu_alias {
-	char *name;
-	struct list_head terms;
-	struct list_head list;
-};
-
 struct perf_pmu {
 	char *name;
 	__u32 type;