summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDing Xiang <dingxiang@cmss.chinamobile.com>2018-09-07 03:34:41 +0200
committerArnaldo Carvalho de Melo <acme@redhat.com>2018-09-19 15:25:08 +0200
commit01ab2e91103b8c23dfedfeb799bc8b810d585bd0 (patch)
tree0a99ab56ea64634e86c4074554685317a1ca947e
parentperf ordered_events: Prevent crossing max_alloc_size (diff)
downloadlinux-01ab2e91103b8c23dfedfeb799bc8b810d585bd0.tar.xz
linux-01ab2e91103b8c23dfedfeb799bc8b810d585bd0.zip
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>
-rw-r--r--tools/include/linux/err.h7
1 files changed, 7 insertions, 0 deletions
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 */