From: Viresh Kumar <viresh.kumar@linaro.org>
Date: Sat, 16 Jan 2016 00:58:10 +0000 (-0800)
Subject: err.h: add (missing) unlikely() to IS_ERR_OR_NULL()
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=dfffa587a6bcd84f2087f88e11600b0e8b0aa1ee;p=linux.git

err.h: add (missing) unlikely() to IS_ERR_OR_NULL()

IS_ERR_VALUE() already contains it and so we need to add this only to
the !ptr check.  That will allow users of IS_ERR_OR_NULL(), to not add
this compiler flag.

Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
---

diff --git a/include/linux/err.h b/include/linux/err.h
index a729120644d59..56762ab417133 100644
--- a/include/linux/err.h
+++ b/include/linux/err.h
@@ -37,7 +37,7 @@ static inline bool __must_check IS_ERR(__force const void *ptr)
 
 static inline bool __must_check IS_ERR_OR_NULL(__force const void *ptr)
 {
-	return !ptr || IS_ERR_VALUE((unsigned long)ptr);
+	return unlikely(!ptr) || IS_ERR_VALUE((unsigned long)ptr);
 }
 
 /**