From: Arnaldo Carvalho de Melo <[email protected]> As al.cpu may be -1, i.e. no PERF_SAMPLE_CPU, and env->cpu may be NULL.
Rely instead on the work now done in perf_event__preprocess_sample(), that does all those checks. Reported-by: Wang Nan <[email protected]> Based-on-a-patch-by: Jiri Olsa <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: David Ahern <[email protected]> Cc: Frederic Weisbecker <[email protected]> Cc: Kan Liang <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Stephane Eranian <[email protected]> Cc: Wang Nan <[email protected]> Link: http://lkml.kernel.org/n/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]> --- tools/perf/builtin-report.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 4b432453922f..9b5083630a56 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -150,7 +150,6 @@ static int process_sample_event(struct perf_tool *tool, .add_entry_cb = hist_iter__report_callback, }; int ret = 0; - struct perf_env *env = evsel->evlist->env; if (perf_event__preprocess_sample(event, machine, &al, sample) < 0) { pr_debug("problem processing %d event, skipping it.\n", @@ -158,9 +157,6 @@ static int process_sample_event(struct perf_tool *tool, return -1; } - /* read socket id from perf.data for perf report */ - al.socket = env->cpu[al.cpu].socket_id; - if (rep->hide_unresolved && al.sym == NULL) goto out_put; -- 2.1.0 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
