From 0e0cd20c794e1b8a1c35ffc756716c1287634ce0 Mon Sep 17 00:00:00 2001
From: Arnaldo Carvalho de Melo <acme@redhat.com>
Date: Fri, 18 Jan 2013 16:55:52 -0300
Subject: [PATCH] --- yaml --- r: 349975 b: refs/heads/master c:
 7c3102b843a581b4b84643a18d423f8807364ca0 h: refs/heads/master i:   349973:
 ea529979613212498b5d7d844bbc647c2d7f178f   349971:
 29289a742227cad506efc534f4c72d00ada440e5   349967:
 26457cc55515116e837cc32daaff588e06f2508b v: v3

---
 [refs]                                  | 2 +-
 trunk/tools/perf/ui/browser.c           | 4 ++--
 trunk/tools/perf/ui/browsers/annotate.c | 8 ++++----
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 01a7dd92bf7a..818f348f6337 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5c6ccc3755650497234f9027a0ac9e3b2cf1ba9f
+refs/heads/master: 7c3102b843a581b4b84643a18d423f8807364ca0
diff --git a/trunk/tools/perf/ui/browser.c b/trunk/tools/perf/ui/browser.c
index 4aeb7d5df939..588bcb2d008b 100644
--- a/trunk/tools/perf/ui/browser.c
+++ b/trunk/tools/perf/ui/browser.c
@@ -471,7 +471,7 @@ unsigned int ui_browser__list_head_refresh(struct ui_browser *browser)
 	return row;
 }
 
-static struct ui_browser__colorset {
+static struct ui_browser_colorset {
 	const char *name, *fg, *bg;
 	int colorset;
 } ui_browser__colorsets[] = {
@@ -706,7 +706,7 @@ void ui_browser__init(void)
 	perf_config(ui_browser__color_config, NULL);
 
 	while (ui_browser__colorsets[i].name) {
-		struct ui_browser__colorset *c = &ui_browser__colorsets[i++];
+		struct ui_browser_colorset *c = &ui_browser__colorsets[i++];
 		sltt_set_color(c->colorset, c->name, c->fg, c->bg);
 	}
 
diff --git a/trunk/tools/perf/ui/browsers/annotate.c b/trunk/tools/perf/ui/browsers/annotate.c
index 2fc7f04691cf..7dca1555c610 100644
--- a/trunk/tools/perf/ui/browsers/annotate.c
+++ b/trunk/tools/perf/ui/browsers/annotate.c
@@ -926,7 +926,7 @@ int symbol__tui_annotate(struct symbol *sym, struct map *map, int evidx,
 /*
  * Keep the entries sorted, they are bsearch'ed
  */
-static struct annotate__config {
+static struct annotate_config {
 	const char *name;
 	bool *value;
 } annotate__configs[] = {
@@ -940,7 +940,7 @@ static struct annotate__config {
 
 static int annotate_config__cmp(const void *name, const void *cfgp)
 {
-	const struct annotate__config *cfg = cfgp;
+	const struct annotate_config *cfg = cfgp;
 
 	return strcmp(name, cfg->name);
 }
@@ -948,7 +948,7 @@ static int annotate_config__cmp(const void *name, const void *cfgp)
 static int annotate__config(const char *var, const char *value,
 			    void *data __maybe_unused)
 {
-	struct annotate__config *cfg;
+	struct annotate_config *cfg;
 	const char *name;
 
 	if (prefixcmp(var, "annotate.") != 0)
@@ -956,7 +956,7 @@ static int annotate__config(const char *var, const char *value,
 
 	name = var + 9;
 	cfg = bsearch(name, annotate__configs, ARRAY_SIZE(annotate__configs),
-		      sizeof(struct annotate__config), annotate_config__cmp);
+		      sizeof(struct annotate_config), annotate_config__cmp);
 
 	if (cfg == NULL)
 		return -1;