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

Pull perf/core improvements and fixes from Arnaldo Carvalho de Melo:

New features:

 - Add --dry-run option to 'perf record' to check if command line options can be
   parsed, but not doing any recording (Wang Nan)

 - Allow dumping the object files generated by llvm when processing eBPF
   scriptlet events (Wang Nan)

 - Add stackcollapse.py script to help generating flame graphs (Paolo Bonzini)

Documentation changes:

 - Fix 'perf script'  documentation of '-f' when it should be '-F' (Adrian Hunter)

Infrastructure changes:

 - Fix write_backwards fallback when using a new tool on older kernels
   without support for this feature (Arnaldo Carvalho de Melo)

 - Remove some leftovers from the initial codebase copying from git
   (Arnaldo Carvalho de Melo)

 - List libelf-devel as an alternative, as this is how the libelf
   development package is called on OpenSuSE (Jean Delvare)

 - Rename __hists__add_entry to hists__add_entry (Jiri Olsa)

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: Ingo Molnar <mingo@kernel.org>

1 files changed, 1 insertions, 1 deletions

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c
index 25c81734a950..a2324e1892aa 100644
--- a/tools/perf/builtin-annotate.c
+++ b/tools/perf/builtin-annotate.c
@@ -75,7 +75,7 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel,
 	sample->period = 1;
 	sample->weight = 1;
 
-	he = __hists__add_entry(hists, al, NULL, NULL, NULL, sample, true);
+	he = hists__add_entry(hists, al, NULL, NULL, NULL, sample, true);
 	if (he == NULL)
 		return -ENOMEM;