perf tools: Be consistent on the type of map->symbols[] interator

In a few cases we were using 'enum map_type' and that triggered this
warning when using clang:

  util/session.c:1923:16: error: comparison of constant 2 with expression of type 'enum map_type' is always true
      [-Werror,-Wtautological-constant-out-of-range-compare]
        for (i = 0; i < MAP__NR_TYPES; ++i) {

Cc: Adrian Hunter <[email protected]>
Cc: David Ahern <[email protected]>
Cc: Jiri Olsa <[email protected]>
Cc: Namhyung Kim <[email protected]>
Cc: Wang Nan <[email protected]>
Link: http://lkml.kernel.org/n/[email protected]
Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index a1043cf9b89c819235af2ff7df903d8cbf79c212..71c9720d49730066dc1100defee124a4d3c198b9 100644 (file)
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -782,7 +782,7 @@ static u64 machine__get_running_kernel_start(struct machine *machine,
 
 int __machine__create_kernel_maps(struct machine *machine, struct dso *kernel)
 {
-       enum map_type type;
+       int type;
        u64 start = machine__get_running_kernel_start(machine, NULL);
 
        /* In case of renewal the kernel map, destroy previous one */
@@ -813,7 +813,7 @@ int __machine__create_kernel_maps(struct machine *machine, struct dso *kernel)
 
 void machine__destroy_kernel_maps(struct machine *machine)
 {
-       enum map_type type;
+       int type;
 
        for (type = 0; type < MAP__NR_TYPES; ++type) {
                struct kmap *kmap;

diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 349c68144e55b7f9eb2950f4db46c7f52b634b8e..4cdbc8f5f14dbf0dff51304ffb59812ce7273ea6 100644 (file)
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1901,7 +1901,7 @@ int maps__set_kallsyms_ref_reloc_sym(struct map **maps,
                                     const char *symbol_name, u64 addr)
 {
        char *bracket;
-       enum map_type i;
+       int i;
        struct ref_reloc_sym *ref;
 
        ref = zalloc(sizeof(struct ref_reloc_sym));