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

Commit 22c06892 authored by Adrian Hunter's avatar Adrian Hunter Committed by Arnaldo Carvalho de Melo
Browse files

perf intel-pt: Move decoder error setting into one condition 



Move decoder error setting into one condition.

Cc'ed to stable because later fixes depend on it.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Cc: Andi Kleen <ak@linux.intel.com>
Cc: stable@vger.kernel.org
Link: http://lkml.kernel.org/r/1495786658-18063-2-git-send-email-adrian.hunter@intel.com


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

tools/perf/util/intel-pt-decoder/intel-pt-decoder.c

+7 −4
Original line number Diff line number Diff line
@@ -2130,15 +2130,18 @@ const struct intel_pt_state *intel_pt_decode(struct intel_pt_decoder *decoder) 
		}

	} while (err == -ENOLINK);



	decoder->state.err = err ? intel_pt_ext_err(err) : 0;

	if (err) {

		decoder->state.err = intel_pt_ext_err(err);

		decoder->state.from_ip = decoder->ip;

	} else {

		decoder->state.err = 0;

	}



	decoder->state.timestamp = decoder->timestamp;

	decoder->state.est_timestamp = intel_pt_est_timestamp(decoder);

	decoder->state.cr3 = decoder->cr3;

	decoder->state.tot_insn_cnt = decoder->tot_insn_cnt;



	if (err)

		decoder->state.from_ip = decoder->ip;



	return &decoder->state;

}