lkml.org 
[lkml]   [2017]   [Jul]   [25]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 4.4 15/83] perf intel-pt: Move decoder error setting into one condition
    Date
    4.4-stable review patch.  If anyone has any objections, please let me know.

    ------------------

    From: Adrian Hunter <adrian.hunter@intel.com>

    commit 22c06892332d8916115525145b78e606e9cc6492 upstream.

    Move decoder error setting into one condition.

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

    Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
    Cc: Andi Kleen <ak@linux.intel.com>
    Link: http://lkml.kernel.org/r/1495786658-18063-2-git-send-email-adrian.hunter@intel.com
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

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

    --- a/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
    +++ b/tools/perf/util/intel-pt-decoder/intel-pt-decoder.c
    @@ -2096,15 +2096,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;
    }


    \
     
     \ /
      Last update: 2017-07-25 23:09    [W:4.180 / U:0.208 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site