From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753527AbbE0Qto (ORCPT ); Wed, 27 May 2015 12:49:44 -0400 Received: from terminus.zytor.com ([198.137.202.10]:39002 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751730AbbE0Qtk (ORCPT ); Wed, 27 May 2015 12:49:40 -0400 Date: Wed, 27 May 2015 09:49:23 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: dsahern@gmail.com, acme@redhat.com, adrian.hunter@intel.com, mingo@kernel.org, tglx@linutronix.de, namhyung@kernel.org, jolsa@redhat.com, dzickus@redhat.com, fweisbec@gmail.com, linux-kernel@vger.kernel.org, eranian@google.com, bp@suse.de, hpa@zytor.com Reply-To: namhyung@kernel.org, dsahern@gmail.com, acme@redhat.com, adrian.hunter@intel.com, mingo@kernel.org, tglx@linutronix.de, bp@suse.de, hpa@zytor.com, jolsa@redhat.com, dzickus@redhat.com, fweisbec@gmail.com, linux-kernel@vger.kernel.org, eranian@google.com To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Rename maps__next Git-Commit-ID: 4d4dee9a9609819309a84cd3f2d19dcc50ece195 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 4d4dee9a9609819309a84cd3f2d19dcc50ece195 Gitweb: http://git.kernel.org/tip/4d4dee9a9609819309a84cd3f2d19dcc50ece195 Author: Arnaldo Carvalho de Melo AuthorDate: Thu, 21 May 2015 17:48:33 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 27 May 2015 12:21:44 -0300 perf tools: Rename maps__next It really is a 'struct map' method, and since we're introducing a new 'struct maps' class, fix it to avoid confusion. Cc: Adrian Hunter Cc: Borislav Petkov Cc: David Ahern Cc: Don Zickus Cc: Frederic Weisbecker Cc: Jiri Olsa Cc: Namhyung Kim Cc: Stephane Eranian Link: http://lkml.kernel.org/n/tip-xo9ifhk53cfl30wqcuhxpnvl@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/map.c | 2 +- tools/perf/util/map.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c index 2d20c5f..09a6273 100644 --- a/tools/perf/util/map.c +++ b/tools/perf/util/map.c @@ -775,7 +775,7 @@ struct map *maps__first(struct rb_root *maps) return NULL; } -struct map *maps__next(struct map *map) +struct map *map__next(struct map *map) { struct rb_node *next = rb_next(&map->rb_node); diff --git a/tools/perf/util/map.h b/tools/perf/util/map.h index 7f39217..aba9569 100644 --- a/tools/perf/util/map.h +++ b/tools/perf/util/map.h @@ -166,7 +166,7 @@ void maps__insert(struct rb_root *maps, struct map *map); void maps__remove(struct rb_root *maps, struct map *map); struct map *maps__find(struct rb_root *maps, u64 addr); struct map *maps__first(struct rb_root *maps); -struct map *maps__next(struct map *map); +struct map *map__next(struct map *map); void map_groups__init(struct map_groups *mg, struct machine *machine); void map_groups__exit(struct map_groups *mg); int map_groups__clone(struct map_groups *mg, @@ -201,7 +201,7 @@ static inline struct map *map_groups__first(struct map_groups *mg, static inline struct map *map_groups__next(struct map *map) { - return maps__next(map); + return map__next(map); } struct symbol *map_groups__find_symbol(struct map_groups *mg,