android/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Viresh Kumar 2016-01-15 16:58:10 -08:00 committed by Linus Torvalds
parent da48d094ce
commit dfffa587a6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/linux/err.h
View File

@ -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) 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);
} }
/** /**