OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip

Browse Source 
Pull perf fixes from Ingo Molnar:
 "Two oneliner 'perf bench' tooling fixes"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  perf bench: Fix NULL pointer dereference in "perf bench all"
  perf bench numa: Make no args mean 'run all tests'
This commit is contained in:
Linus Torvalds 2014-03-22 09:13:59 -07:00
commit 774868c709
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
tools/perf/bench/numa.c
View File

@ -1593,6 +1593,7 @@ static void init_params(struct params *p, const char *name, int argc, const char
p->data_rand_walk = true; p->data_rand_walk = true;
p->nr_loops = -1; p->nr_loops = -1;
p->init_random = true; p->init_random = true;
p->run_all = argc == 1;
} }
static int run_bench_numa(const char *name, const char **argv) static int run_bench_numa(const char *name, const char **argv)

2
tools/perf/builtin-bench.c
View File

@ -76,7 +76,7 @@ static struct collection collections[] = {
/* Iterate over all benchmarks within a collection: */ /* Iterate over all benchmarks within a collection: */
#define for_each_bench(coll, bench) \ #define for_each_bench(coll, bench) \
for (bench = coll->benchmarks; bench->name; bench++) for (bench = coll->benchmarks; bench && bench->name; bench++)
static void dump_benchmarks(struct collection *coll) static void dump_benchmarks(struct collection *coll)
{ {