Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 774868c7 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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'
parents 084c6c50 7c144bfb

tools/perf/bench/numa.c

+1 −0
Original line number Diff line number Diff line
@@ -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)

tools/perf/builtin-bench.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{