From: Ingo Molnar <mingo@kernel.org>
Date: Mon, 14 Apr 2014 14:45:39 +0000 (+0200)
Subject: Merge branch 'perf-core-for-mingo' into perf/urgent
X-Git-Tag: v4.9.8~6248^2~42
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=fbdd17ec5ce2e5e4027356fcfde769b88d15702f;p=platform%2Fkernel%2Flinux-rpi3.git

Merge branch 'perf-core-for-mingo' into perf/urgent

Conflicts:
	tools/perf/bench/numa.c

Pull perf fixes from Jiri Olsa.

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

fbdd17ec5ce2e5e4027356fcfde769b88d15702f
diff --cc tools/perf/bench/numa.c
index 97d86d8,20697fb..ebfa163
--- a/tools/perf/bench/numa.c
+++ b/tools/perf/bench/numa.c
@@@ -1593,7 -1593,10 +1593,11 @@@ static void init_params(struct params *
  	p->data_rand_walk		= true;
  	p->nr_loops			= -1;
  	p->init_random			= true;
+ 	p->mb_global_str		= "1";
+ 	p->nr_proc			= 1;
+ 	p->nr_threads			= 1;
+ 	p->nr_secs			= 5;
 +	p->run_all			= argc == 1;
  }
  
  static int run_bench_numa(const char *name, const char **argv)