mirror of
https://github.com/torvalds/linux.git
synced 2024-12-03 17:41:22 +00:00
1d037ca164
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>
94 lines
1.3 KiB
Plaintext
94 lines
1.3 KiB
Plaintext
|
|
%name-prefix "perf_pmu_"
|
|
%parse-param {struct list_head *format}
|
|
%parse-param {char *name}
|
|
|
|
%{
|
|
|
|
#include <linux/compiler.h>
|
|
#include <linux/list.h>
|
|
#include <linux/bitmap.h>
|
|
#include <string.h>
|
|
#include "pmu.h"
|
|
|
|
extern int perf_pmu_lex (void);
|
|
|
|
#define ABORT_ON(val) \
|
|
do { \
|
|
if (val) \
|
|
YYABORT; \
|
|
} while (0)
|
|
|
|
%}
|
|
|
|
%token PP_CONFIG PP_CONFIG1 PP_CONFIG2
|
|
%token PP_VALUE PP_ERROR
|
|
%type <num> PP_VALUE
|
|
%type <bits> bit_term
|
|
%type <bits> bits
|
|
|
|
%union
|
|
{
|
|
unsigned long num;
|
|
DECLARE_BITMAP(bits, PERF_PMU_FORMAT_BITS);
|
|
}
|
|
|
|
%%
|
|
|
|
format:
|
|
format format_term
|
|
|
|
|
format_term
|
|
|
|
format_term:
|
|
PP_CONFIG ':' bits
|
|
{
|
|
ABORT_ON(perf_pmu__new_format(format, name,
|
|
PERF_PMU_FORMAT_VALUE_CONFIG,
|
|
$3));
|
|
}
|
|
|
|
|
PP_CONFIG1 ':' bits
|
|
{
|
|
ABORT_ON(perf_pmu__new_format(format, name,
|
|
PERF_PMU_FORMAT_VALUE_CONFIG1,
|
|
$3));
|
|
}
|
|
|
|
|
PP_CONFIG2 ':' bits
|
|
{
|
|
ABORT_ON(perf_pmu__new_format(format, name,
|
|
PERF_PMU_FORMAT_VALUE_CONFIG2,
|
|
$3));
|
|
}
|
|
|
|
bits:
|
|
bits ',' bit_term
|
|
{
|
|
bitmap_or($$, $1, $3, 64);
|
|
}
|
|
|
|
|
bit_term
|
|
{
|
|
memcpy($$, $1, sizeof($1));
|
|
}
|
|
|
|
bit_term:
|
|
PP_VALUE '-' PP_VALUE
|
|
{
|
|
perf_pmu__set_format($$, $1, $3);
|
|
}
|
|
|
|
|
PP_VALUE
|
|
{
|
|
perf_pmu__set_format($$, $1, 0);
|
|
}
|
|
|
|
%%
|
|
|
|
void perf_pmu_error(struct list_head *list __maybe_unused,
|
|
char *name __maybe_unused,
|
|
char const *msg __maybe_unused)
|
|
{
|
|
}
|