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

Commit 7c144bfb authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge tag 'perf-urgent-for-mingo' of... 

Merge tag 'perf-urgent-for-mingo' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

 into perf/urgent

Pull two 'perf bench' fixes from Arnaldo:

  * Make 'perf bench mem' (i.e. no args) mean 'run all tests' so that we can run
    all tests, not stopping at the numa ones.  (Arnaldo Carvalho de Melo)

  * Fix NULL pointer dereference after last test in in "perf bench all" (Patrick Palka)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents dcb99fd9 6eeefccd

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)

{