From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755448AbcHXJ0Z (ORCPT ); Wed, 24 Aug 2016 05:26:25 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44230 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754169AbcHXJ0S (ORCPT ); Wed, 24 Aug 2016 05:26:18 -0400 Date: Wed, 24 Aug 2016 02:24:00 -0700 From: tip-bot for Rui Teng Message-ID: Cc: mingo@kernel.org, hpa@zytor.com, acme@redhat.com, rui.teng@linux.vnet.ibm.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, alexander.shishkin@linux.intel.com, peterz@infradead.org Reply-To: linux-kernel@vger.kernel.org, tglx@linutronix.de, peterz@infradead.org, alexander.shishkin@linux.intel.com, hpa@zytor.com, mingo@kernel.org, acme@redhat.com, rui.teng@linux.vnet.ibm.com In-Reply-To: <1469671557-2256-2-git-send-email-rui.teng@linux.vnet.ibm.com> References: <1469671557-2256-2-git-send-email-rui.teng@linux.vnet.ibm.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Use __weak definition from linux/compiler.h Git-Commit-ID: 11d8f870c8eb8dd41ade688fbad6946ad69243fe 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: 11d8f870c8eb8dd41ade688fbad6946ad69243fe Gitweb: http://git.kernel.org/tip/11d8f870c8eb8dd41ade688fbad6946ad69243fe Author: Rui Teng AuthorDate: Thu, 28 Jul 2016 10:05:57 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 23 Aug 2016 15:37:33 -0300 perf tools: Use __weak definition from linux/compiler.h Replace __attribute__((weak)) with __weak definition Signed-off-by: Rui Teng Cc: Alexander Shishkin Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1469671557-2256-2-git-send-email-rui.teng@linux.vnet.ibm.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/header.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c index 8f0db40..85dd0db 100644 --- a/tools/perf/util/header.c +++ b/tools/perf/util/header.c @@ -828,8 +828,7 @@ static int write_group_desc(int fd, struct perf_header *h __maybe_unused, * default get_cpuid(): nothing gets recorded * actual implementation must be in arch/$(ARCH)/util/header.c */ -int __attribute__ ((weak)) get_cpuid(char *buffer __maybe_unused, - size_t sz __maybe_unused) +int __weak get_cpuid(char *buffer __maybe_unused, size_t sz __maybe_unused) { return -1; }