[PATCH 01/16] tools: Fix shadowed declaration in err.h

From: Arnaldo Carvalho de Melo
Date: Wed Sep 30 2015 - 17:59:52 EST

From: Jiri Olsa <jolsa@xxxxxxxxxx>

The error variable breaks build on CentOS 6.7, due to collision with
global error symbol:

CC util/evlist.o
cc1: warnings being treated as errors
In file included from util/evlist.c:28:
tools/include/linux/err.h: In function âERR_PTRâ:
tools/include/linux/err.h:34: error: declaration of âerrorâ shadows a global declaration
util/util.h:135: error: shadowed declaration is here

Using 'error_' name instead to fix it.

Signed-off-by: Jiri Olsa <jolsa@xxxxxxxxxx>
Link: http://lkml.kernel.org/n/tip-i9mdgdbrgauy3fe76s9rd125@xxxxxxxxxxxxxx
Reported-by: Vinson Lee <vlee@xxxxxxxxxxxxxxxx>
[ Use 'error_' instead of 'err' to, visually, not diverge too much from include/linux/err.h ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@xxxxxxxxxx>
tools/include/linux/err.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tools/include/linux/err.h b/tools/include/linux/err.h
index c9ada48f5156..bdc3dd8131d4 100644
--- a/tools/include/linux/err.h
+++ b/tools/include/linux/err.h
@@ -31,9 +31,9 @@

#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)

-static inline void * __must_check ERR_PTR(long error)
+static inline void * __must_check ERR_PTR(long error_)
- return (void *) error;
+ return (void *) error_;

static inline long __must_check PTR_ERR(__force const void *ptr)

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/