perf top: Use machine->kptr_restrict_warned

tip:perf/urgent tip-bot for Arnaldo Carvalho de Melo 1 participant 1 message May 20, 2016 perf events

Share & tools

tip-bot for Arnaldo Carvalho de Melo

author merge bot

2016-05-20 17:44 UTC #0 lore raw

Commit-ID:  e77a07425f4391da2f08b0f9a09df4e70626204d
Gitweb:     http://git.kernel.org/tip/e77a07425f4391da2f08b0f9a09df4e70626204d
Author:     Arnaldo Carvalho de Melo <[email protected]>
AuthorDate: Tue, 17 May 2016 11:58:52 -0300
Committer:  Arnaldo Carvalho de Melo <[email protected]>
CommitDate: Fri, 20 May 2016 11:43:55 -0300

perf top: Use machine->kptr_restrict_warned

Its now there, no need to have it too.

Cc Adrian Hunter <[email protected]>

Cc David Ahern <[email protected]>

Cc Jiri Olsa <[email protected]>

Cc Milian Wolff <[email protected]>

Cc Namhyung Kim <[email protected]>

Cc Wang Nan <[email protected]>

Link http://lkml.kernel.org/n/[email protected] open here

Signed-off-by Arnaldo Carvalho de Melo <[email protected]>

---
 tools/perf/builtin-top.c | 6 +++---
 tools/perf/util/top.h    | 1 -
 2 files changed, 3 insertions(+), 4 deletions(-)

tools/perf/builtin-top.c +3 -3

index 1793da5..2a6cc25 100644
@@ -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

index f92c37a..b2940c8 100644
@@ -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;