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

Commit 07394b5f authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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

Merge tag 'perf-core-for-mingo' 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:

User visible changes:

  o Restore "--callchain graph" output, broken in recent cset to end
    up being the same as "fractal" (Namhyung Kim)

  o Allow profiling when kptr_restrict == 1 for non root users,
    kernel samples will just remain unresolved (Andi Kleen)

  o Allow configuring default options for callchains in config file (Namhyung Kim)

  o Fix line number in the config file error message (Jiri Olsa)

  o Fix --per-core on multi socket systems (Andi Kleen)

Cleanups:

  o Use ACCESS_ONCE() instead of volatile cast. (Pranith Kumar)

  o Modify error code for when perf_session__new() fails (Taeung Song)

Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents cf8102f6 49757c9c

tools/perf/builtin-annotate.c

+1 −1
Original line number Diff line number Diff line
@@ -340,7 +340,7 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) 


	annotate.session = perf_session__new(&file, false, &annotate.tool);

	if (annotate.session == NULL)

		return -ENOMEM;

		return -1;



	symbol_conf.priv_size = sizeof(struct annotation);

	symbol_conf.try_vmlinux_path = true;

tools/perf/builtin-diff.c

+1 −1
Original line number Diff line number Diff line
@@ -683,7 +683,7 @@ static int __cmd_diff(void) 
		d->session = perf_session__new(&d->file, false, &tool);

		if (!d->session) {

			pr_err("Failed to open %s\n", d->file.path);

			ret = -ENOMEM;

			ret = -1;

			goto out_delete;

		}

tools/perf/builtin-evlist.c

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ static int __cmd_evlist(const char *file_name, struct perf_attr_details *details 


	session = perf_session__new(&file, 0, NULL);

	if (session == NULL)

		return -ENOMEM;

		return -1;



	evlist__for_each(session->evlist, pos)

		perf_evsel__fprintf(pos, details, stdout);

tools/perf/builtin-inject.c

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ int cmd_inject(int argc, const char **argv, const char *prefix __maybe_unused) 
	file.path = inject.input_name;

	inject.session = perf_session__new(&file, true, &inject.tool);

	if (inject.session == NULL)

		return -ENOMEM;

		return -1;



	if (symbol__init(&inject.session->header.env) < 0)

		return -1;

tools/perf/builtin-kmem.c

+1 −1
Original line number Diff line number Diff line
@@ -698,7 +698,7 @@ int cmd_kmem(int argc, const char **argv, const char *prefix __maybe_unused) 


	session = perf_session__new(&file, false, &perf_kmem);

	if (session == NULL)

		return -ENOMEM;

		return -1;



	symbol__init(&session->header.env);