[kernel/f18] Fix perf report field separator issue (rhbz 906055)

[Josh Boyer]

commit 6b1ca21dd3c883617964ff95958a41c4f3dc7fcf
Author: Josh Boyer <jwboyer at redhat.com>
Date:   Wed Feb 20 12:21:26 2013 -0500

    Fix perf report field separator issue (rhbz 906055)

 kernel.spec                                        |   13 ++++-
 ...-Fix-period-symbol_conf.field_sep-display.patch |   48 ++++++++++++++++++++
 2 files changed, 58 insertions(+), 3 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index b410b19..fedd8fb 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -793,13 +793,16 @@ Patch22247: ath9k_rx_dma_stop_check.patch
 #rhbz 911479 911473 CVE-2013-0290
 Patch22256: net-fix-infinite-loop-in-__skb_recv_datagram.patch
 
+#rhbz 909591
+Patch22255: usb-cypress-supertop.patch
+
 #rhbz 844750
 Patch22257: 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
 
-Patch23000: silence-brcmsmac-warning.patch
+#rhbz 906055
+Patch22258: perf-hists-Fix-period-symbol_conf.field_sep-display.patch
 
-#rhbz 909591
-Patch21255: usb-cypress-supertop.patch
+Patch23000: silence-brcmsmac-warning.patch
 
 #rhbz 812111
 Patch24000: alps-v2-3.7.patch
@@ -1538,6 +1541,9 @@ ApplyPatch net-fix-infinite-loop-in-__skb_recv_datagram.patch
 #rhbz 844750
 ApplyPatch 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
 
+#rhbz 906055
+ApplyPatch perf-hists-Fix-period-symbol_conf.field_sep-display.patch
+
 #rhbz 812111
 ApplyPatch alps-v2-3.7.patch
 
@@ -2405,6 +2411,7 @@ fi
 #                 ||     ||
 %changelog
 * Wed Feb 20 2013 Josh Boyer <jwboyer at redhat.com>
+- Fix perf report field separator issue (rhbz 906055)
 - Fix oops from acpi_rsdp setup in secure-boot patchset (rhbz 906225)
 
 * Tue Feb 19 2013 Josh Boyer <jwboyer at redhat.com>
diff --git a/perf-hists-Fix-period-symbol_conf.field_sep-display.patch b/perf-hists-Fix-period-symbol_conf.field_sep-display.patch
new file mode 100644
index 0000000..f81755c
--- /dev/null
+++ b/perf-hists-Fix-period-symbol_conf.field_sep-display.patch
@@ -0,0 +1,48 @@
+From 755b5f5715c117f4723ec04a81a46da85c9179a3 Mon Sep 17 00:00:00 2001
+From: Jiri Olsa <jolsa at redhat.com>
+Date: Sat, 20 Oct 2012 22:14:10 +0200
+Subject: [PATCH] perf hists: Fix period symbol_conf.field_sep display
+
+Upstream commit c0d246b85fc7d42688d7a5d999ea671777caf65b
+
+Currently we don't properly display hist data with symbol_conf.field_sep
+separator. We need to display either space or separator.
+
+Signed-off-by: Jiri Olsa <jolsa at redhat.com>
+Cc: Arnaldo Carvalho de Melo <acme at ghostprotocols.net>
+Cc: Peter Zijlstra <a.p.zijlstra at chello.nl>
+Cc: Ingo Molnar <mingo at elte.hu>
+Cc: Paul Mackerras <paulus at samba.org>
+Cc: Corey Ashford <cjashfor at linux.vnet.ibm.com>
+Cc: Frederic Weisbecker <fweisbec at gmail.com>
+Cc: Namhyung Kim <namhyung at kernel.org>
+Link: http://lkml.kernel.org/n/tip-cyggwys0bz5kqdowwvfd8h72@git.kernel.org
+Signed-off-by: Arnaldo Carvalho de Melo <acme at redhat.com>
+---
+ tools/perf/ui/hist.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/tools/perf/ui/hist.c b/tools/perf/ui/hist.c
+index f5a1e4f..947e20a 100644
+--- a/tools/perf/ui/hist.c
++++ b/tools/perf/ui/hist.c
+@@ -363,11 +363,15 @@ int hist_entry__period_snprintf(struct perf_hpp *hpp, struct hist_entry *he,
+ 		if (!perf_hpp__format[i].cond)
+ 			continue;
+ 
++		/*
++		 * If there's no field_sep, we still need
++		 * to display initial '  '.
++		 */
+ 		if (!sep || !first) {
+ 			ret = scnprintf(hpp->buf, hpp->size, "%s", sep ?: "  ");
+ 			advance_hpp(hpp, ret);
++		} else
+ 			first = false;
+-		}
+ 
+ 		if (color && perf_hpp__format[i].color)
+ 			ret = perf_hpp__format[i].color(hpp, he);
+-- 
+1.8.1.2
+