rpms
/
kernel
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix perf report field separator issue (rhbz 906055) 

- Add support for Atheros 04ca:3004 bluetooth devices (rhbz 844750)
- Backport support for newer ALPS touchpads (rhbz 812111)
This commit is contained in:
Josh Boyer 2013-02-20 12:23:53 -05:00
parent 7a177e376a
commit 2038832ba0
2 changed files with 58 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
kernel.spec
View File

@ -54,7 +54,7 @@ Summary: The Linux kernel
# For non-released -rc kernels, this will be appended after the rcX and
# gitX tags, so a 3 here would become part of release "0.rcX.gitX.3"
#
%global baserelease 102
%global baserelease 103
%global fedora_build %{baserelease}
# base_sublevel is the kernel version we're starting with and patching
@ -770,6 +770,9 @@ Patch22256: net-fix-infinite-loop-in-__skb_recv_datagram.patch
#rhbz 844750
Patch22257: 0001-bluetooth-Add-support-for-atheros-04ca-3004-device-t.patch
#rhbz 906055
Patch22258: perf-hists-Fix-period-symbol_conf.field_sep-display.patch
Patch23000: silence-brcmsmac-warning.patch
#rhbz 812111
@ -1492,6 +1495,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
@ -2350,6 +2356,9 @@ fi
# '-' | |
# '-'
%changelog
* Wed Feb 20 2013 Josh Boyer <jwboyer@redhat.com>
- Fix perf report field separator issue (rhbz 906055)
* Tue Feb 19 2013 Josh Boyer <jwboyer@redhat.com>
- Add support for Atheros 04ca:3004 bluetooth devices (rhbz 844750)
- Backport support for newer ALPS touchpads (rhbz 812111)

48
perf-hists-Fix-period-symbol_conf.field_sep-display.patch Normal file
View File

@ -0,0 +1,48 @@
From 755b5f5715c117f4723ec04a81a46da85c9179a3 Mon Sep 17 00:00:00 2001
From: Jiri Olsa <jolsa@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@redhat.com>
Cc: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/n/tip-cyggwys0bz5kqdowwvfd8h72@git.kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@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