Skip to content

Commit 774868c

Browse files
committed
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'
2 parents 084c6c5 + 7c144bf commit 774868c

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

tools/perf/bench/numa.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1593,6 +1593,7 @@ static void init_params(struct params *p, const char *name, int argc, const char
15931593
p->data_rand_walk = true;
15941594
p->nr_loops = -1;
15951595
p->init_random = true;
1596+
p->run_all = argc == 1;
15961597
}
15971598

15981599
static int run_bench_numa(const char *name, const char **argv)

tools/perf/builtin-bench.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ static struct collection collections[] = {
7676

7777
/* Iterate over all benchmarks within a collection: */
7878
#define for_each_bench(coll, bench) \
79-
for (bench = coll->benchmarks; bench->name; bench++)
79+
for (bench = coll->benchmarks; bench && bench->name; bench++)
8080

8181
static void dump_benchmarks(struct collection *coll)
8282
{

0 commit comments

Comments
 (0)