From: Yuya Fujita <fujita.yuya@fujitsu.com>

Date: Thu, 19 Dec 2019 08:08:32 +0000

Subject: perf hists: Fix variable name's inconsistency in hists__for_each()

 macro

Git-commit: 55347ec340af401437680fd0e88df6739a967f9f

Patch-mainline: v5.5-rc7

References: git-fixes

​

Variable names are inconsistent in hists__for_each macro().

​

Due to this inconsistency, the macro replaces its second argument with

"fmt" regardless of its original name.

​

So far it works because only "fmt" is passed to the second argument.

However, this behavior is not expected and should be fixed.

​

Fixes: f0786af536bb ("perf hists: Introduce hists__for_each_format macro")

Fixes: aa6f50af822a ("perf hists: Introduce hists__for_each_sort_list macro")

Signed-off-by: Yuya Fujita <fujita.yuya@fujitsu.com>

Acked-by: Jiri Olsa <jolsa@kernel.org>

Cc: Peter Zijlstra <peterz@infradead.org>

Link: http://lore.kernel.org/lkml/OSAPR01MB1588E1C47AC22043175DE1B2E8520@OSAPR01MB1588.jpnprd01.prod.outlook.com

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

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

---

 tools/perf/util/hist.h | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

​

diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h

index 45286900aacb..0aa63aeb58ec 100644

--- a/tools/perf/util/hist.h

+++ b/tools/perf/util/hist.h

@@ -339,10 +339,10 @@ static inline void perf_hpp__prepend_sort_field(struct perf_hpp_fmt *format)

    list_for_each_entry_safe(format, tmp, &(_list)->sorts, sort_list)

 #define hists__for_each_format(hists, format) \

-   perf_hpp_list__for_each_format((hists)->hpp_list, fmt)

+   perf_hpp_list__for_each_format((hists)->hpp_list, format)

 #define hists__for_each_sort_list(hists, format) \

-   perf_hpp_list__for_each_sort_list((hists)->hpp_list, fmt)

+   perf_hpp_list__for_each_sort_list((hists)->hpp_list, format)

 extern struct perf_hpp_fmt perf_hpp__format[];

​

​