From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753784AbdECRfX (ORCPT ); Wed, 3 May 2017 13:35:23 -0400 Received: from terminus.zytor.com ([65.50.211.136]:47881 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751515AbdECRfR (ORCPT ); Wed, 3 May 2017 13:35:17 -0400 Date: Wed, 3 May 2017 10:34:05 -0700 From: tip-bot for Arnaldo Carvalho de Melo Message-ID: Cc: hpa@zytor.com, tglx@linutronix.de, mingo@kernel.org, acme@redhat.com, linux-kernel@vger.kernel.org Reply-To: mingo@kernel.org, linux-kernel@vger.kernel.org, acme@redhat.com, hpa@zytor.com, tglx@linutronix.de To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/urgent] perf buildid: Move prototypes from util.h to build-id.h Git-Commit-ID: 6db81643fe41f51cf9f6fd10558b8b323d9198ba 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: 6db81643fe41f51cf9f6fd10558b8b323d9198ba Gitweb: http://git.kernel.org/tip/6db81643fe41f51cf9f6fd10558b8b323d9198ba Author: Arnaldo Carvalho de Melo AuthorDate: Tue, 25 Apr 2017 11:45:59 -0300 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 25 Apr 2017 11:45:59 -0300 perf buildid: Move prototypes from util.h to build-id.h Where they belong. Link: http://lkml.kernel.org/n/tip-94m3dziejxgo7k0488q3mqjm@git.kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/tests/sdt.c | 1 - tools/perf/util/build-id.h | 4 ++++ tools/perf/util/util.h | 3 --- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tools/perf/tests/sdt.c b/tools/perf/tests/sdt.c index f73b3c5..06eda67 100644 --- a/tools/perf/tests/sdt.c +++ b/tools/perf/tests/sdt.c @@ -1,7 +1,6 @@ #include #include #include -#include #include #include #include "tests.h" diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h index a960811..8a89b19 100644 --- a/tools/perf/util/build-id.h +++ b/tools/perf/util/build-id.h @@ -44,6 +44,10 @@ bool build_id_cache__cached(const char *sbuild_id); int build_id_cache__add_s(const char *sbuild_id, const char *name, bool is_kallsyms, bool is_vdso); int build_id_cache__remove_s(const char *sbuild_id); + +extern char buildid_dir[]; + +void set_buildid_dir(const char *dir); void disable_buildid_cache(void); #endif diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h index 3852b6d..e7b6f36 100644 --- a/tools/perf/util/util.h +++ b/tools/perf/util/util.h @@ -14,8 +14,6 @@ #include #include -extern char buildid_dir[]; - #ifdef __GNUC__ #define NORETURN __attribute__((__noreturn__)) #else @@ -36,7 +34,6 @@ void warning(const char *err, ...) __attribute__((format (printf, 1, 2))); void set_warning_routine(void (*routine)(const char *err, va_list params)); int prefixcmp(const char *str, const char *prefix); -void set_buildid_dir(const char *dir); static inline void *zalloc(size_t size) {