From mboxrd@z Thu Jan 1 00:00:00 1970 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933297AbeAIPnD (ORCPT + 1 other); Tue, 9 Jan 2018 10:43:03 -0500 Received: from mx1.redhat.com ([209.132.183.28]:49862 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932920AbeAIPhL (ORCPT ); Tue, 9 Jan 2018 10:37:11 -0500 From: Jiri Olsa To: Arnaldo Carvalho de Melo Cc: lkml , Ingo Molnar , Namhyung Kim , David Ahern , Andi Kleen , Alexander Shishkin , Peter Zijlstra Subject: [PATCH 30/49] perf tools: Rename perf_evlist__munmap_filtered to perf_mmap__put_filtered Date: Tue, 9 Jan 2018 16:35:03 +0100 Message-Id: <20180109153522.14116-31-jolsa@kernel.org> In-Reply-To: <20180109153522.14116-1-jolsa@kernel.org> References: <20180109153522.14116-1-jolsa@kernel.org> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Tue, 09 Jan 2018 15:37:11 +0000 (UTC) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return-Path: We will use it outside the evlist scope. Link: http://lkml.kernel.org/n/tip-0r9rtn1bii1iaggumlgkyxqk@git.kernel.org Signed-off-by: Jiri Olsa --- tools/perf/util/evlist.c | 6 +++--- tools/perf/util/evlist.h | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c index 635b0938c200..93bf777ef7c7 100644 --- a/tools/perf/util/evlist.c +++ b/tools/perf/util/evlist.c @@ -502,8 +502,8 @@ int perf_evlist__add_pollfd(struct perf_evlist *evlist, int fd) return __perf_evlist__add_pollfd(evlist, fd, NULL, POLLIN); } -static void perf_evlist__munmap_filtered(struct fdarray *fda, int fd, - void *arg __maybe_unused) +void perf_mmap__put_filtered(struct fdarray *fda, int fd, + void *arg __maybe_unused) { struct perf_mmap *map = fda->priv[fd].ptr; @@ -514,7 +514,7 @@ static void perf_evlist__munmap_filtered(struct fdarray *fda, int fd, int perf_evlist__filter_pollfd(struct perf_evlist *evlist, short revents_and_mask) { return fdarray__filter(&evlist->pollfd, revents_and_mask, - perf_evlist__munmap_filtered, NULL); + perf_mmap__put_filtered, NULL); } int perf_evlist__poll(struct perf_evlist *evlist, int timeout) diff --git a/tools/perf/util/evlist.h b/tools/perf/util/evlist.h index 4f7b7f68704b..8d72e8378838 100644 --- a/tools/perf/util/evlist.h +++ b/tools/perf/util/evlist.h @@ -322,4 +322,5 @@ struct perf_evsel *perf_evlist__event2evsel(struct perf_evlist *evlist, union perf_event *event); bool perf_evlist__exclude_kernel(struct perf_evlist *evlist); +void perf_mmap__put_filtered(struct fdarray *fda, int fd, void *arg); #endif /* __PERF_EVLIST_H */ -- 2.13.6