diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-22 09:13:59 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-03-22 09:13:59 -0700 |
| commit | 774868c7094d35b4518be3d0e654de000a5d11fc (patch) | |
| tree | dca59caccf93e19ddb184ec5abdc78e959d550ab | |
| parent | 084c6c5013af3c62f1c344435214496f5ac999f2 (diff) | |
| parent | 7c144bfbf89d612f0c62b7e71056fb687b068455 (diff) | |
| download | lwn-774868c7094d35b4518be3d0e654de000a5d11fc.tar.gz lwn-774868c7094d35b4518be3d0e654de000a5d11fc.zip | |
Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
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'
| -rw-r--r-- | tools/perf/bench/numa.c | 1 | ||||
| -rw-r--r-- | tools/perf/builtin-bench.c | 2 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/perf/bench/numa.c b/tools/perf/bench/numa.c index d4c83c60b9b2..97d86d828190 100644 --- a/tools/perf/bench/numa.c +++ b/tools/perf/bench/numa.c @@ -1593,6 +1593,7 @@ 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->run_all = argc == 1; } static int run_bench_numa(const char *name, const char **argv) diff --git a/tools/perf/builtin-bench.c b/tools/perf/builtin-bench.c index e47f90cc7b98..8a987d252780 100644 --- a/tools/perf/builtin-bench.c +++ b/tools/perf/builtin-bench.c @@ -76,7 +76,7 @@ static struct collection collections[] = { /* Iterate over all benchmarks within a collection: */ #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) { |