From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 31 Aug 2015 08:25:26 +0000 (+0200)
Subject: Merge branch 'perf/urgent' into perf/core, to pick up fixes
X-Git-Tag: firefly_0821_release~176^2~1201^2~1
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=02b643b643254ec79b5f9aaa143e10be68eabdab;p=firefly-linux-kernel-4.4.55.git

Merge branch 'perf/urgent' into perf/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
---

02b643b643254ec79b5f9aaa143e10be68eabdab
diff --cc tools/perf/builtin-stat.c
index 7aa039bd379a,ef355fc0e870..d46dbb1bc65d
--- a/tools/perf/builtin-stat.c
+++ b/tools/perf/builtin-stat.c
@@@ -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;