Patch "perf intel-pt: Move decoder error setting into one condition" has been added to the 4.12-stable tree

This is a note to let you know that I've just added the patch titled

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

to the 4.12-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary

The filename of the patch is:
perf-intel-pt-move-decoder-error-setting-into-one-condition.patch
and it can be found in the queue-4.12 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.

From: Adrian Hunter <[email protected]>
Date: Fri, 26 May 2017 11:17:02 +0300
Subject: perf intel-pt: Move decoder error setting into one condition

From: Adrian Hunter <[email protected]>

commit 22c06892332d8916115525145b78e606e9cc6492 upstream.

Move decoder error setting into one condition.

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

---
 tools/perf/util/intel-pt-decoder/intel-pt-decoder.c |   11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

@@ -2130,15 +2130,18 @@ const struct intel_pt_state *intel_pt_de
 		}
 	} 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;
 }
 

Patches currently in stable-queue which might be from [email protected] are

queue-4.12/perf-intel-pt-ensure-ip-is-zero-when-state-is-intel_pt_state_no_ip.patch queue-4.12/perf-intel-pt-ensure-never-to-set-last_ip-when-packet-count-is-zero.patch queue-4.12/perf-intel-pt-use-fup-always-when-scanning-for-an-ip.patch queue-4.12/perf-intel-pt-fix-last_ip-usage.patch queue-4.12/perf-intel-pt-move-decoder-error-setting-into-one-condition.patch queue-4.12/perf-intel-pt-clear-fup-flag-on-error.patch queue-4.12/perf-intel-pt-improve-sample-timestamp.patch queue-4.12/perf-intel-pt-fix-missing-stack-clear.patch