Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Tue, 25 Sep 2018 02:30:06 -0700
From:   tip-bot for Ding Xiang <tipbot@zytor.com>
Message-ID: <tip-01ab2e91103b8c23dfedfeb799bc8b810d585bd0@git.kernel.org>
Cc:     alexander.shishkin@linux.intel.com, tglx@linutronix.de,
        dingxiang@cmss.chinamobile.com, hpa@zytor.com, namhyung@kernel.org,
        mingo@kernel.org, jolsa@redhat.com, linux-kernel@vger.kernel.org,
        peterz@infradead.org, acme@redhat.com
Reply-To: hpa@zytor.com, namhyung@kernel.org, mingo@kernel.org,
          tglx@linutronix.de, alexander.shishkin@linux.intel.com,
          dingxiang@cmss.chinamobile.com, peterz@infradead.org,
          acme@redhat.com, jolsa@redhat.com, linux-kernel@vger.kernel.org
In-Reply-To: <1536284082-23466-1-git-send-email-dingxiang@cmss.chinamobile.com>
References: <1536284082-23466-1-git-send-email-dingxiang@cmss.chinamobile.com>
To:     linux-tip-commits@vger.kernel.org
Subject: [tip:perf/core] tools include: Adopt PTR_ERR_OR_ZERO from the
 kernel err.h header
Git-Commit-ID: 01ab2e91103b8c23dfedfeb799bc8b810d585bd0
Robot-ID: <tip-bot.git.kernel.org>
Robot-Unsubscribe: Contact <mailto:hpa@kernel.org> 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
Precedence: bulk

Commit-ID:  01ab2e91103b8c23dfedfeb799bc8b810d585bd0
Gitweb:     https://git.kernel.org/tip/01ab2e91103b8c23dfedfeb799bc8b810d585bd0
Author:     Ding Xiang <dingxiang@cmss.chinamobile.com>
AuthorDate: Fri, 7 Sep 2018 09:34:41 +0800
Committer:  Arnaldo Carvalho de Melo <acme@redhat.com>
CommitDate: Wed, 19 Sep 2018 10:25:08 -0300

tools include: Adopt PTR_ERR_OR_ZERO from the kernel err.h header

Add PTR_ERR_OR_ZERO, so that tools can use it, just like the kernel.

Signed-off-by: Ding Xiang <dingxiang@cmss.chinamobile.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: http://lkml.kernel.org/r/1536284082-23466-1-git-send-email-dingxiang@cmss.chinamobile.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/include/linux/err.h | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tools/include/linux/err.h b/tools/include/linux/err.h
index 7a8b61ad44cb..094649667bae 100644
--- a/tools/include/linux/err.h
+++ b/tools/include/linux/err.h
@@ -52,4 +52,11 @@ static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
 	return unlikely(!ptr) || IS_ERR_VALUE((unsigned long)ptr);
 }
 
+static inline int __must_check PTR_ERR_OR_ZERO(__force const void *ptr)
+{
+	if (IS_ERR(ptr))
+		return PTR_ERR(ptr);
+	else
+		return 0;
+}
 #endif /* _LINUX_ERR_H */