From: Clément Le Goffic Date: Wed, 5 Jun 2024 14:04:53 +0000 (+0200) Subject: perf: parse-events: Fix compilation error while defining DEBUG_PARSER X-Git-Tag: v6.11-rc1~130^2~111 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=9aa61d8ecb7f6f176ff8247a41a4f6eea8376112;p=thirdparty%2Fkernel%2Flinux.git perf: parse-events: Fix compilation error while defining DEBUG_PARSER Compiling perf tool with 'DEBUG_PARSER=1' leads to errors: $> make -C tools/perf PARSER_DEBUG=1 NO_LIBTRACEEVENT=1 ... CC util/expr-flex.o CC util/expr.o util/parse-events.c:33:12: error: redundant redeclaration of ‘parse_events_debug’ [-Werror=redundant-decls] 33 | extern int parse_events_debug; | ^~~~~~~~~~~~~~~~~~ In file included from util/parse-events.c:18: util/parse-events-bison.h:43:12: note: previous declaration of ‘parse_events_debug’ with type ‘int’ 43 | extern int parse_events_debug; | ^~~~~~~~~~~~~~~~~~ util/expr.c:27:12: error: redundant redeclaration of ‘expr_debug’ [-Werror=redundant-decls] 27 | extern int expr_debug; | ^~~~~~~~~~ In file included from util/expr.c:11: util/expr-bison.h:43:12: note: previous declaration of ‘expr_debug’ with type ‘int’ 43 | extern int expr_debug; | ^~~~~~~~~~ cc-1: all warnings being treated as errors Remove extern declaration from the parse-envents.c file as there is a conflict with the ones generated using bison and yacc tools from the file parse-events.[ly]. Signed-off-by: Clément Le Goffic Reviewed-by: Ian Rogers Cc: James Clark Cc: John Garry Signed-off-by: Namhyung Kim Link: https://lore.kernel.org/r/20240605140453.614862-1-clement.legoffic@foss.st.com --- diff --git a/tools/perf/util/expr.c b/tools/perf/util/expr.c index b8875aac8f870..b2536a59c44e6 100644 --- a/tools/perf/util/expr.c +++ b/tools/perf/util/expr.c @@ -25,10 +25,6 @@ #include #include "pmu.h" -#ifdef PARSER_DEBUG -extern int expr_debug; -#endif - struct expr_id_data { union { struct { diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c index 6ed0f9c5581de..8d5fb05f20c24 100644 --- a/tools/perf/util/parse-events.c +++ b/tools/perf/util/parse-events.c @@ -31,9 +31,6 @@ #define MAX_NAME_LEN 100 -#ifdef PARSER_DEBUG -extern int parse_events_debug; -#endif static int get_config_terms(const struct parse_events_terms *head_config, struct list_head *head_terms); static int parse_events_terms__copy(const struct parse_events_terms *src,