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 a116e05d in builtin-sched.c ] Signed-off-by:
Arnaldo Carvalho de Melo <acme@redhat.com>
Showing
- tools/lib/traceevent/event-parse.c 5 additions, 3 deletionstools/lib/traceevent/event-parse.c
- tools/lib/traceevent/event-parse.h 2 additions, 2 deletionstools/lib/traceevent/event-parse.h
- tools/perf/bench/bench.h 2 additions, 1 deletiontools/perf/bench/bench.h
- tools/perf/bench/mem-memcpy.c 1 addition, 1 deletiontools/perf/bench/mem-memcpy.c
- tools/perf/bench/mem-memset.c 1 addition, 1 deletiontools/perf/bench/mem-memset.c
- tools/perf/bench/sched-messaging.c 1 addition, 1 deletiontools/perf/bench/sched-messaging.c
- tools/perf/bench/sched-pipe.c 3 additions, 3 deletionstools/perf/bench/sched-pipe.c
- tools/perf/builtin-annotate.c 1 addition, 1 deletiontools/perf/builtin-annotate.c
- tools/perf/builtin-bench.c 1 addition, 1 deletiontools/perf/builtin-bench.c
- tools/perf/builtin-buildid-cache.c 4 additions, 3 deletionstools/perf/builtin-buildid-cache.c
- tools/perf/builtin-buildid-list.c 2 additions, 1 deletiontools/perf/builtin-buildid-list.c
- tools/perf/builtin-diff.c 2 additions, 2 deletionstools/perf/builtin-diff.c
- tools/perf/builtin-evlist.c 1 addition, 1 deletiontools/perf/builtin-evlist.c
- tools/perf/builtin-help.c 1 addition, 1 deletiontools/perf/builtin-help.c
- tools/perf/builtin-inject.c 13 additions, 11 deletionstools/perf/builtin-inject.c
- tools/perf/builtin-kmem.c 12 additions, 10 deletionstools/perf/builtin-kmem.c
- tools/perf/builtin-kvm.c 1 addition, 1 deletiontools/perf/builtin-kvm.c
- tools/perf/builtin-list.c 1 addition, 1 deletiontools/perf/builtin-list.c
- tools/perf/builtin-lock.c 2 additions, 2 deletionstools/perf/builtin-lock.c
- tools/perf/builtin-probe.c 12 additions, 12 deletionstools/perf/builtin-probe.c
Loading
Please register or sign in to comment