Merge branch 'perf/urgent' into perf/core, to pick up fixes
authorIngo Molnar <mingo@kernel.org>
Mon, 31 Aug 2015 08:25:26 +0000 (10:25 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 31 Aug 2015 08:25:26 +0000 (10:25 +0200)
Signed-off-by: Ingo Molnar <mingo@kernel.org>
1  2 
tools/perf/builtin-stat.c

index 7aa039bd379a42e3d10cdd4e76115fccbc6bb881,ef355fc0e870c15eac2e7d295b2046b7cc283caa..d46dbb1bc65d95980b13ec7f473f793c8262a05b
@@@ -563,9 -693,8 +563,9 @@@ static void abs_printout(int id, int nr
  
  static void print_aggr(char *prefix)
  {
 +      FILE *output = stat_config.output;
        struct perf_evsel *counter;
-       int cpu, cpu2, s, s2, id, nr;
+       int cpu, s, s2, id, nr;
        double uval;
        u64 ena, run, val;