[tip:locking/core] tools/include: Add IS_ERR_OR_NULL to err.h
From: tip-bot for Levin, Alexander (Sasha Levin)
Date: Mon Jun 05 2017 - 05:15:00 EST
Commit-ID: 61d4595eed163ea416c13c4b994f22190711151b
Gitweb: http://git.kernel.org/tip/61d4595eed163ea416c13c4b994f22190711151b
Author: Levin, Alexander (Sasha Levin) <alexander.levin@xxxxxxxxxxx>
AuthorDate: Thu, 25 May 2017 12:58:56 +0000
Committer: Ingo Molnar <mingo@xxxxxxxxxx>
CommitDate: Mon, 5 Jun 2017 09:28:12 +0200
tools/include: Add IS_ERR_OR_NULL to err.h
Signed-off-by: Sasha Levin <alexander.levin@xxxxxxxxxxx>
Cc: Linus Torvalds <torvalds@xxxxxxxxxxxxxxxxxxxx>
Cc: Peter Zijlstra <peterz@xxxxxxxxxxxxx>
Cc: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Cc: a.p.zijlstra@xxxxxxxxx
Cc: ben@xxxxxxxxxxxxxxx
Link: http://lkml.kernel.org/r/20170525130005.5947-20-alexander.levin@xxxxxxxxxxx
Signed-off-by: Ingo Molnar <mingo@xxxxxxxxxx>
---
tools/include/linux/err.h | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/tools/include/linux/err.h b/tools/include/linux/err.h
index bdc3dd8..abf0478 100644
--- a/tools/include/linux/err.h
+++ b/tools/include/linux/err.h
@@ -46,4 +46,9 @@ static inline bool __must_check IS_ERR(__force const void *ptr)
return IS_ERR_VALUE((unsigned long)ptr);
}
+static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
+{
+ return unlikely(!ptr) || IS_ERR_VALUE((unsigned long)ptr);
+}
+
#endif /* _LINUX_ERR_H */