]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
perf tools: Fix pmu object compilation error
authorJiri Olsa <jolsa@redhat.com>
Wed, 16 Apr 2014 18:49:02 +0000 (20:49 +0200)
committerJiri Olsa <jolsa@redhat.com>
Tue, 22 Apr 2014 15:39:09 +0000 (17:39 +0200)
After applying some patches got another shadowing error:

  CC       util/pmu.o
util/pmu.c: In function ‘pmu_alias_terms’:
util/pmu.c:287:35: error: declaration of ‘clone’ shadows a global declaration [-Werror=shadow]

Renaming clone to cloned.

Acked-by: David Ahern <dsahern@gmail.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1397674818-27054-1-git-send-email-jolsa@redhat.com
Signed-off-by: Jiri Olsa <jolsa@redhat.com>
tools/perf/util/pmu.c

index 00a7dcb2f55cb0d7734e7eb331384d00aa42809c..7a811eb61f75fc9b00205fd778c30cc417b0f887 100644 (file)
@@ -284,17 +284,17 @@ static int pmu_aliases(const char *name, struct list_head *head)
 static int pmu_alias_terms(struct perf_pmu_alias *alias,
                           struct list_head *terms)
 {
-       struct parse_events_term *term, *clone;
+       struct parse_events_term *term, *cloned;
        LIST_HEAD(list);
        int ret;
 
        list_for_each_entry(term, &alias->terms, list) {
-               ret = parse_events_term__clone(&clone, term);
+               ret = parse_events_term__clone(&cloned, term);
                if (ret) {
                        parse_events__free_terms(&list);
                        return ret;
                }
-               list_add_tail(&clone->list, &list);
+               list_add_tail(&cloned->list, &list);
        }
        list_splice(&list, terms);
        return 0;