From 81169a1ec502ccc8750e9e8e525240f5ed0499ab Mon Sep 17 00:00:00 2001
From: Namhyung Kim <namhyung.kim@lge.com>
Date: Thu, 29 Nov 2012 14:38:40 -0300
Subject: [PATCH] --- yaml --- r: 349885 b: refs/heads/master c:
 2850d9487266a55a18d340c24f5107696deeebb9 h: refs/heads/master i:   349883:
 f82c24a851bce1c43373866cab2c7486a858bb7a v: v3

---
 [refs]                       | 2 +-
 trunk/tools/perf/util/hist.c | 4 ++--
 trunk/tools/perf/util/sort.h | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index f6d7adade430..a45714a6d2e7 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3843b05d6ef20acbd4b0043e4ab7536602eb10ae
+refs/heads/master: 2850d9487266a55a18d340c24f5107696deeebb9
diff --git a/trunk/tools/perf/util/hist.c b/trunk/tools/perf/util/hist.c
index cb17e2a8c6ed..d2bc05cd1708 100644
--- a/trunk/tools/perf/util/hist.c
+++ b/trunk/tools/perf/util/hist.c
@@ -785,7 +785,7 @@ void hists__match(struct hists *leader, struct hists *other)
 		pair = hists__find_entry(other, pos);
 
 		if (pair)
-			hist__entry_add_pair(pos, pair);
+			hist_entry__add_pair(pos, pair);
 	}
 }
 
@@ -806,7 +806,7 @@ int hists__link(struct hists *leader, struct hists *other)
 			pair = hists__add_dummy_entry(leader, pos);
 			if (pair == NULL)
 				return -1;
-			hist__entry_add_pair(pair, pos);
+			hist_entry__add_pair(pair, pos);
 		}
 	}
 
diff --git a/trunk/tools/perf/util/sort.h b/trunk/tools/perf/util/sort.h
index b4e8c3ba559d..91ae2744e7d5 100644
--- a/trunk/tools/perf/util/sort.h
+++ b/trunk/tools/perf/util/sort.h
@@ -118,7 +118,7 @@ static inline struct hist_entry *hist_entry__next_pair(struct hist_entry *he)
 	return NULL;
 }
 
-static inline void hist__entry_add_pair(struct hist_entry *he,
+static inline void hist_entry__add_pair(struct hist_entry *he,
 					struct hist_entry *pair)
 {
 	list_add_tail(&he->pairs.head, &pair->pairs.node);