From: Taeung Song <treeze.taeung@gmail.com>

Date: Fri, 21 Jul 2017 11:38:48 -0300

Subject: perf annotate: Do not overwrite sample->period

Git-commit: ecd5f9959d2c9540482977ff1208ea67fbfb8cc9

Patch-mainline: v4.14-rc1

References: References: bsc#1070010 (git-fixes)

Signed-off-By: Tony Jones <tonyj@suse.de>

​

In fixing the --show-total-period option it was noticed that the value

of sample->period was being overwritten, fix it.

​

Signed-off-by: Taeung Song <treeze.taeung@gmail.com>

Cc: Jiri Olsa <jolsa@redhat.com>

Cc: Milian Wolff <milian.wolff@kdab.com>

Cc: Namhyung Kim <namhyung@kernel.org>

Fixes: fd36f3dd7933 ("perf hist: Pass struct sample to __hists__add_entry()")

Link: http://lkml.kernel.org/r/1500500215-16646-1-git-send-email-treeze.taeung@gmail.com

[ split from a larger patch, added the Fixes tag ]

Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

---

 tools/perf/builtin-annotate.c | 1 -

 1 file changed, 1 deletion(-)

​

diff --git a/tools/perf/builtin-annotate.c b/tools/perf/builtin-annotate.c

index 96fe1a88c1e5..7e33278eff67 100644

--- a/tools/perf/builtin-annotate.c

+++ b/tools/perf/builtin-annotate.c

@@ -177,7 +177,6 @@ static int perf_evsel__add_sample(struct perf_evsel *evsel,

     */

    process_branch_stack(sample->branch_stack, al, sample);

-   sample->period = 1;

    sample->weight = 1;

    he = hists__add_entry(hists, al, NULL, NULL, NULL, sample, true);

​

​