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

Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git

kernel os linux

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'

Linus Torvalds 12 years ago 774868c7 084c6c50

+2 -1

2 changed files

expand all

tools

perf

bench

numa.c

builtin-bench.c

tools/perf/bench/numa.c

··· 1593 1593 p->data_rand_walk = true; 1594 1594 p->nr_loops = -1; 1595 1595 p->init_random = true; 1596 + p->run_all = argc == 1; 1596 1597 } 1597 1598 1598 1599 static int run_bench_numa(const char *name, const char **argv)

+1 -1

tools/perf/builtin-bench.c

··· 76 76 77 77 /* Iterate over all benchmarks within a collection: */ 78 78 #define for_each_bench(coll, bench) \ 79 - for (bench = coll->benchmarks; bench->name; bench++) 79 + for (bench = coll->benchmarks; bench && bench->name; bench++) 80 80 81 81 static void dump_benchmarks(struct collection *coll) 82 82 {

Configure Feed

Configure Feed