From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751978AbbFYH4z (ORCPT ); Thu, 25 Jun 2015 03:56:55 -0400 Received: from terminus.zytor.com ([198.137.202.10]:36361 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751327AbbFYH4p (ORCPT ); Thu, 25 Jun 2015 03:56:45 -0400 Date: Thu, 25 Jun 2015 00:56:26 -0700 From: tip-bot for Sukadev Bhattiprolu Message-ID: Cc: ak@linux.intel.com, tglx@linutronix.de, hpa@zytor.com, jolsa@redhat.com, namhyung@kernel.org, sukadev@linux.vnet.ibm.com, acme@redhat.com, linux-kernel@vger.kernel.org, maddy@linux.vnet.ibm.com, mingo@kernel.org, mpe@ellerman.id.au Reply-To: mpe@ellerman.id.au, maddy@linux.vnet.ibm.com, mingo@kernel.org, acme@redhat.com, linux-kernel@vger.kernel.org, namhyung@kernel.org, sukadev@linux.vnet.ibm.com, hpa@zytor.com, jolsa@redhat.com, ak@linux.intel.com, tglx@linutronix.de In-Reply-To: <1433921123-25327-4-git-send-email-sukadev@linux.vnet.ibm.com> References: <1433921123-25327-4-git-send-email-sukadev@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf pmu: Use __weak definition from Git-Commit-ID: c5de47f2e803c7e6ffc0a34b174d4d009c8bd8e1 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: c5de47f2e803c7e6ffc0a34b174d4d009c8bd8e1 Gitweb: http://git.kernel.org/tip/c5de47f2e803c7e6ffc0a34b174d4d009c8bd8e1 Author: Sukadev Bhattiprolu AuthorDate: Wed, 10 Jun 2015 00:25:07 -0700 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 23 Jun 2015 18:21:15 -0300 perf pmu: Use __weak definition from Jiri Olsa pointed out, that the defines the attribute '__weak'. We might as well use that. Signed-off-by: Sukadev Bhattiprolu Acked-by: Jiri Olsa Cc: Andi Kleen Cc: Madhavan Srinivasan Cc: Michael Ellerman Cc: Namhyung Kim Cc: linuxppc-dev@lists.ozlabs.org Link: http://lkml.kernel.org/r/1433921123-25327-4-git-send-email-sukadev@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/pmu.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c index 0fcc624..c6b16b1 100644 --- a/tools/perf/util/pmu.c +++ b/tools/perf/util/pmu.c @@ -1,4 +1,5 @@ #include +#include #include #include #include @@ -436,7 +437,7 @@ static struct cpu_map *pmu_cpumask(const char *name) return cpus; } -struct perf_event_attr *__attribute__((weak)) +struct perf_event_attr * __weak perf_pmu__get_default_config(struct perf_pmu *pmu __maybe_unused) { return NULL;