From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755764AbbJAHKO (ORCPT ); Thu, 1 Oct 2015 03:10:14 -0400 Received: from terminus.zytor.com ([198.137.202.10]:44299 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755600AbbJAHKM (ORCPT ); Thu, 1 Oct 2015 03:10:12 -0400 Date: Thu, 1 Oct 2015 00:09:56 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: tglx@linutronix.de, hpa@zytor.com, acme@redhat.com, vlee@twopensource.com, jolsa@kernel.org, jolsa@redhat.com, linux-kernel@vger.kernel.org, mingo@kernel.org Reply-To: acme@redhat.com, vlee@twopensource.com, jolsa@redhat.com, jolsa@kernel.org, tglx@linutronix.de, hpa@zytor.com, mingo@kernel.org, linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] tools: Fix shadowed declaration in err.h Git-Commit-ID: 45633a169571e81835ec53fe0c089dd20f3195f1 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 45633a169571e81835ec53fe0c089dd20f3195f1 Gitweb: http://git.kernel.org/tip/45633a169571e81835ec53fe0c089dd20f3195f1 Author: Jiri Olsa AuthorDate: Tue, 29 Sep 2015 16:53:12 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 30 Sep 2015 18:34:22 -0300 tools: Fix shadowed declaration in err.h 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 Link: http://lkml.kernel.org/n/tip-i9mdgdbrgauy3fe76s9rd125@git.kernel.org Reported-by: Vinson Lee [ Use 'error_' instead of 'err' to, visually, not diverge too much from include/linux/err.h ] Signed-off-by: Arnaldo Carvalho de Melo --- 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 c9ada48..bdc3dd8 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)