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/util/sort.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/util/sort.c')
-rw-r--r-- | tools/perf/util/sort.c | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index 7a2fbd8855b..0981bc7a291 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c | |||
@@ -170,7 +170,7 @@ static int hist_entry__dso_snprintf(struct hist_entry *self, char *bf, | |||
170 | 170 | ||
171 | static int _hist_entry__sym_snprintf(struct map *map, struct symbol *sym, | 171 | static int _hist_entry__sym_snprintf(struct map *map, struct symbol *sym, |
172 | u64 ip, char level, char *bf, size_t size, | 172 | u64 ip, char level, char *bf, size_t size, |
173 | unsigned int width __used) | 173 | unsigned int width __maybe_unused) |
174 | { | 174 | { |
175 | size_t ret = 0; | 175 | size_t ret = 0; |
176 | 176 | ||
@@ -205,7 +205,8 @@ struct sort_entry sort_dso = { | |||
205 | }; | 205 | }; |
206 | 206 | ||
207 | static int hist_entry__sym_snprintf(struct hist_entry *self, char *bf, | 207 | static int hist_entry__sym_snprintf(struct hist_entry *self, char *bf, |
208 | size_t size, unsigned int width __used) | 208 | size_t size, |
209 | unsigned int width __maybe_unused) | ||
209 | { | 210 | { |
210 | return _hist_entry__sym_snprintf(self->ms.map, self->ms.sym, self->ip, | 211 | return _hist_entry__sym_snprintf(self->ms.map, self->ms.sym, self->ip, |
211 | self->level, bf, size, width); | 212 | self->level, bf, size, width); |
@@ -248,7 +249,8 @@ sort__srcline_cmp(struct hist_entry *left, struct hist_entry *right) | |||
248 | } | 249 | } |
249 | 250 | ||
250 | static int hist_entry__srcline_snprintf(struct hist_entry *self, char *bf, | 251 | static int hist_entry__srcline_snprintf(struct hist_entry *self, char *bf, |
251 | size_t size, unsigned int width __used) | 252 | size_t size, |
253 | unsigned int width __maybe_unused) | ||
252 | { | 254 | { |
253 | FILE *fp; | 255 | FILE *fp; |
254 | char cmd[PATH_MAX + 2], *path = self->srcline, *nl; | 256 | char cmd[PATH_MAX + 2], *path = self->srcline, *nl; |
@@ -397,7 +399,8 @@ sort__sym_to_cmp(struct hist_entry *left, struct hist_entry *right) | |||
397 | } | 399 | } |
398 | 400 | ||
399 | static int hist_entry__sym_from_snprintf(struct hist_entry *self, char *bf, | 401 | static int hist_entry__sym_from_snprintf(struct hist_entry *self, char *bf, |
400 | size_t size, unsigned int width __used) | 402 | size_t size, |
403 | unsigned int width __maybe_unused) | ||
401 | { | 404 | { |
402 | struct addr_map_symbol *from = &self->branch_info->from; | 405 | struct addr_map_symbol *from = &self->branch_info->from; |
403 | return _hist_entry__sym_snprintf(from->map, from->sym, from->addr, | 406 | return _hist_entry__sym_snprintf(from->map, from->sym, from->addr, |
@@ -406,7 +409,8 @@ static int hist_entry__sym_from_snprintf(struct hist_entry *self, char *bf, | |||
406 | } | 409 | } |
407 | 410 | ||
408 | static int hist_entry__sym_to_snprintf(struct hist_entry *self, char *bf, | 411 | static int hist_entry__sym_to_snprintf(struct hist_entry *self, char *bf, |
409 | size_t size, unsigned int width __used) | 412 | size_t size, |
413 | unsigned int width __maybe_unused) | ||
410 | { | 414 | { |
411 | struct addr_map_symbol *to = &self->branch_info->to; | 415 | struct addr_map_symbol *to = &self->branch_info->to; |
412 | return _hist_entry__sym_snprintf(to->map, to->sym, to->addr, | 416 | return _hist_entry__sym_snprintf(to->map, to->sym, to->addr, |