From a0c0b72c8781df30a304ee1f3321527bcc53748a Mon Sep 17 00:00:00 2001
From: Jiri Olsa <jolsa@redhat.com>
Date: Thu, 6 Sep 2012 17:46:56 +0200
Subject: [PATCH] --- yaml --- r: 323778 b: refs/heads/master c:
 0ca0c130419a4aa05d28fbecc5d360f051944251 h: refs/heads/master v: v3

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

diff --git a/[refs] b/[refs]
index d6127c453e48..a080363174e8 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 863e451f69ddf255e877567e325298edd3b21519
+refs/heads/master: 0ca0c130419a4aa05d28fbecc5d360f051944251
diff --git a/trunk/tools/perf/util/sort.c b/trunk/tools/perf/util/sort.c
index 0f5a0a496bc4..7a2fbd8855b7 100644
--- a/trunk/tools/perf/util/sort.c
+++ b/trunk/tools/perf/util/sort.c
@@ -12,8 +12,6 @@ int		sort__branch_mode = -1; /* -1 = means not set */
 
 enum sort_type	sort__first_dimension;
 
-char * field_sep;
-
 LIST_HEAD(hist_entry__sort_list);
 
 static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...)
@@ -23,11 +21,11 @@ static int repsep_snprintf(char *bf, size_t size, const char *fmt, ...)
 
 	va_start(ap, fmt);
 	n = vsnprintf(bf, size, fmt, ap);
-	if (field_sep && n > 0) {
+	if (symbol_conf.field_sep && n > 0) {
 		char *sep = bf;
 
 		while (1) {
-			sep = strchr(sep, *field_sep);
+			sep = strchr(sep, *symbol_conf.field_sep);
 			if (sep == NULL)
 				break;
 			*sep = '.';
diff --git a/trunk/tools/perf/util/sort.h b/trunk/tools/perf/util/sort.h
index e724b26acd51..e459c981b039 100644
--- a/trunk/tools/perf/util/sort.h
+++ b/trunk/tools/perf/util/sort.h
@@ -32,7 +32,6 @@ extern const char default_sort_order[];
 extern int sort__need_collapse;
 extern int sort__has_parent;
 extern int sort__branch_mode;
-extern char *field_sep;
 extern struct sort_entry sort_comm;
 extern struct sort_entry sort_dso;
 extern struct sort_entry sort_sym;