diff options
| author | Ingo Molnar <mingo@kernel.org> | 2014-04-14 16:45:39 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2014-04-14 16:45:39 +0200 |
| commit | fbdd17ec5ce2e5e4027356fcfde769b88d15702f (patch) | |
| tree | d655577d9bb40b7c9a03d35b513fd9a1bbfe431d /tools/perf/bench | |
| parent | 740c699a8d316c8bf8593f19e2ca47795e690622 (diff) | |
| parent | 90f6bb6c98ffef42125d7be6d4612505f561fbce (diff) | |
| download | linux-fbdd17ec5ce2e5e4027356fcfde769b88d15702f.tar.bz2 | |
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>
Diffstat (limited to 'tools/perf/bench')
| -rw-r--r-- | tools/perf/bench/numa.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c index 97d86d828190..ebfa163b80b5 100644 --- a/tools/perf/bench/numa.c +++ b/tools/perf/bench/numa.c @@ -1593,6 +1593,10 @@ static void init_params(struct params *p, const char *name, int argc, const char 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; } |