[tip:perf/core] perf tools: Use __weak definition from linux/compiler.h
From: tip-bot for Rui Teng
Date: Wed Aug 24 2016 - 05:26:29 EST
Commit-ID: 11d8f870c8eb8dd41ade688fbad6946ad69243fe
Gitweb: http://git.kernel.org/tip/11d8f870c8eb8dd41ade688fbad6946ad69243fe
Author: Rui Teng <rui.teng@xxxxxxxxxxxxxxxxxx>
AuthorDate: Thu, 28 Jul 2016 10:05:57 +0800
Committer: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
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 <rui.teng@xxxxxxxxxxxxxxxxxx>
Cc: Alexander Shishkin <alexander.shishkin@xxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Link: http://lkml.kernel.org/r/1469671557-2256-2-git-send-email-rui.teng@xxxxxxxxxxxxxxxxxx
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
---
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;
}