diff options
author | Irina Tirdea <irina.tirdea@gmail.com> | 2012-09-10 18:15:03 -0400 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2012-09-11 11:19:15 -0400 |
commit | 1d037ca1648b775277fc96401ec2aa233724906c (patch) | |
tree | 266722dc6c9e00c67c66f5f8d06f30d0c2dd3979 /tools/perf/builtin-buildid-cache.c | |
parent | 7dbf4dcfe2987c35c2c4675cd7ae1b6006979176 (diff) |
perf tools: Use __maybe_used for unused variables
perf defines both __used and __unused variables to use for marking
unused variables. The variable __used is defined to
__attribute__((__unused__)), which contradicts the kernel definition to
__attribute__((__used__)) for new gcc versions. On Android, __used is
also defined in system headers and this leads to warnings like: warning:
'__used__' attribute ignored
__unused is not defined in the kernel and is not a standard definition.
If __unused is included everywhere instead of __used, this leads to
conflicts with glibc headers, since glibc has a variables with this name
in its headers.
The best approach is to use __maybe_unused, the definition used in the
kernel for __attribute__((unused)). In this way there is only one
definition in perf sources (instead of 2 definitions that point to the
same thing: __used and __unused) and it works on both Linux and Android.
This patch simply replaces all instances of __used and __unused with
__maybe_unused.
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Acked-by: Pekka Enberg <penberg@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Namhyung Kim <namhyung.kim@lge.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Steven Rostedt <rostedt@goodmis.org>
Link: http://lkml.kernel.org/r/1347315303-29906-7-git-send-email-irina.tirdea@intel.com
[ committer note: fixed up conflict with a116e05 in builtin-sched.c ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Diffstat (limited to 'tools/perf/builtin-buildid-cache.c')
-rw-r--r-- | tools/perf/builtin-buildid-cache.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/tools/perf/builtin-buildid-cache.c b/tools/perf/builtin-buildid-cache.c index 995368e84e4..83654557e10 100644 --- a/tools/perf/builtin-buildid-cache.c +++ b/tools/perf/builtin-buildid-cache.c | |||
@@ -51,8 +51,8 @@ static int build_id_cache__add_file(const char *filename, const char *debugdir) | |||
51 | return err; | 51 | return err; |
52 | } | 52 | } |
53 | 53 | ||
54 | static int build_id_cache__remove_file(const char *filename __used, | 54 | static int build_id_cache__remove_file(const char *filename __maybe_unused, |
55 | const char *debugdir __used) | 55 | const char *debugdir __maybe_unused) |
56 | { | 56 | { |
57 | u8 build_id[BUILD_ID_SIZE]; | 57 | u8 build_id[BUILD_ID_SIZE]; |
58 | char sbuild_id[BUILD_ID_SIZE * 2 + 1]; | 58 | char sbuild_id[BUILD_ID_SIZE * 2 + 1]; |
@@ -120,7 +120,8 @@ static int __cmd_buildid_cache(void) | |||
120 | return 0; | 120 | return 0; |
121 | } | 121 | } |
122 | 122 | ||
123 | int cmd_buildid_cache(int argc, const char **argv, const char *prefix __used) | 123 | int cmd_buildid_cache(int argc, const char **argv, |
124 | const char *prefix __maybe_unused) | ||
124 | { | 125 | { |
125 | argc = parse_options(argc, argv, buildid_cache_options, | 126 | argc = parse_options(argc, argv, buildid_cache_options, |
126 | buildid_cache_usage, 0); | 127 | buildid_cache_usage, 0); |