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

Commit e77a0742 authored by Arnaldo Carvalho de Melo's avatar Arnaldo Carvalho de Melo
Browse files

perf top: Use machine->kptr_restrict_warned 

Its now there, no need to have it too.

Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Milian Wolff <milian.wolff@kdab.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-y18oeou494uy11im7u9to0dx@git.kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent caf8a0d0

tools/perf/builtin-top.c

+3 −3
Original line number Diff line number Diff line
@@ -732,7 +732,7 @@ static void perf_event__process_sample(struct perf_tool *tool, 
	if (machine__resolve(machine, &al, sample) < 0)

		return;



	if (!top->kptr_restrict_warned &&

	if (!machine->kptr_restrict_warned &&

	    symbol_conf.kptr_restrict &&

	    al.cpumode == PERF_RECORD_MISC_KERNEL) {

		ui__warning(
@@ -743,7 +743,7 @@ static void perf_event__process_sample(struct perf_tool *tool, 
			  " modules" : "");

		if (use_browser <= 0)

			sleep(5);

		top->kptr_restrict_warned = true;

		machine->kptr_restrict_warned = true;

	}



	if (al.sym == NULL) {
@@ -759,7 +759,7 @@ static void perf_event__process_sample(struct perf_tool *tool, 
		 * --hide-kernel-symbols, even if the user specifies an

		 * invalid --vmlinux ;-)

		 */

		if (!top->kptr_restrict_warned && !top->vmlinux_warned &&

		if (!machine->kptr_restrict_warned && !top->vmlinux_warned &&

		    al.map == machine->vmlinux_maps[MAP__FUNCTION] &&

		    RB_EMPTY_ROOT(&al.map->dso->symbols[MAP__FUNCTION])) {

			if (symbol_conf.vmlinux_name) {

tools/perf/util/top.h

+0 −1
Original line number Diff line number Diff line
@@ -27,7 +27,6 @@ struct perf_top { 
	int		   max_stack;

	bool		   hide_kernel_symbols, hide_user_symbols, zero;

	bool		   use_tui, use_stdio;

	bool		   kptr_restrict_warned;

	bool		   vmlinux_warned;

	bool		   dump_symtab;

	struct hist_entry  *sym_filter_entry;