Hello community,

here is the log from the commit of package perf for openSUSE:Factory checked in 
at 2015-06-30 10:19:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/perf (Old)
 and      /work/SRC/openSUSE:Factory/.perf.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "perf"

Changes:
--------
--- /work/SRC/openSUSE:Factory/perf/perf.changes        2015-05-15 
07:44:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.perf.new/perf.changes   2015-06-30 
10:19:37.000000000 +0200
@@ -1,0 +2,6 @@
+Sun Jun 28 15:54:43 UTC 2015 - [email protected]
+
+- Fix build with GCC 5
+  * perf-fix-branch-stack-mode-cannot-be-set.patch
+
+-------------------------------------------------------------------

New:
----
  perf-fix-branch-stack-mode-cannot-be-set.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ perf.spec ++++++
--- /var/tmp/diff_new_pack.uvzut0/_old  2015-06-30 10:19:37.000000000 +0200
+++ /var/tmp/diff_new_pack.uvzut0/_new  2015-06-30 10:19:37.000000000 +0200
@@ -24,6 +24,8 @@
 License:        GPL-2.0
 Group:          Development/Tools/Debuggers
 Url:            https://perf.wiki.kernel.org/
+# PATCH-FIX-UPSTREAM perf-fix-branch-stack-mode-cannot-be-set.patch -- fix 
build with GCC 5 (fix wrong comparison logic)
+Patch:          perf-fix-branch-stack-mode-cannot-be-set.patch
 BuildRequires:  asciidoc
 BuildRequires:  audit-devel
 BuildRequires:  binutils-devel
@@ -63,6 +65,7 @@
 # copy necessary files from kernel-source since we need to modify them
 (cd /usr/src/linux ; tar -cf - COPYING CREDITS README tools include scripts 
Kbuild Makefile arch/*/{include,lib,Makefile} lib) | tar -xf - 
 chmod +x tools/perf/util/generate-cmdlist.sh
+%patch -p1
 
 %build
 cd tools/perf

++++++ perf-fix-branch-stack-mode-cannot-be-set.patch ++++++
>From fefd2d9619de3bf0bf02a8622e9f445c3d19cc3f Mon Sep 17 00:00:00 2001
From: He Kuang <[email protected]>
Date: Sun, 15 Feb 2015 10:33:37 +0800
Subject: perf report: Fix branch stack mode cannot be set

When perf.data file is obtained using 'perf record -b', perf report
should use branch stack mode to generate output. But this function is
broken by improper comparison between boolean and constant -1.

before this patch:

  $ perf report -b -i perf.data
  Samples: 16  of event 'cycles', Event count (approx.): 3171896
  Overhead  Command  Shared Object      Symbol
    13.59%  ls       [kernel.kallsyms]  [k] prio_tree_remove
    13.16%  ls       [kernel.kallsyms]  [k] change_pte_range
    12.09%  ls       [kernel.kallsyms]  [k] page_fault
    12.02%  ls       [kernel.kallsyms]  [k] zap_pte_range
  ...

after this patch:

  $ perf report -b -i perf.data
  Samples: 256  of event 'cycles', Event count (approx.): 256
  Overhead  Command  Source Shared Object  Source Symbol                        
       Target Shared Object  Target Symbol
     9.38%  ls       [unknown]             [k] 0000000000000000                 
       [unknown]             [k] 0000000000000000
     6.25%  ls       libc-2.19.so          [.] _dl_addr                         
       libc-2.19.so          [.] _dl_addr
     6.25%  ls       [kernel.kallsyms]     [k] zap_pte_range                    
       [kernel.kallsyms]     [k] zap_pte_range
     6.25%  ls       [kernel.kallsyms]     [k] change_pte_range                 
       [kernel.kallsyms]     [k] change_pte_range
     0.39%  ls       [kernel.kallsyms]     [k] prio_tree_remove                 
       [kernel.kallsyms]     [k] prio_tree_remove
  ...

Signed-off-by: He Kuang <[email protected]>
Tested-by: Arnaldo Carvalho de Melo <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Wang Nan <[email protected]>
Link: 
http://lkml.kernel.org/r/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 0ba5f07..fb35034 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -768,7 +768,7 @@ repeat:
         * 0/1 means the user chose a mode.
         */
        if (((branch_mode == -1 && has_br_stack) || branch_mode == 1) &&
-           branch_call_mode == -1) {
+           !branch_call_mode) {
                sort__mode = SORT_MODE__BRANCH;
                symbol_conf.cumulate_callchain = false;
        }
-- 
cgit v0.10.2


Reply via email to