diff options
| author |   Ingo Molnar <mingo@kernel.org> | 2016-06-08 09:26:46 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2016-06-08 09:26:46 +0200 |
| commit | 616d1c1b98ac79f30216a57a170dd7cea19b3df3 (patch) | |
| tree | 6f244c2e5a7160190e73bc82b4cd7fa7bb22ee31 /include/linux/err.h | |
| parent | perf/core: Fix crash due to account/unaccount_sb_event() inconsistency (diff) | |
| parent | Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs (diff) | |
| download | linux-dev-616d1c1b98ac79f30216a57a170dd7cea19b3df3.tar.xz linux-dev-616d1c1b98ac79f30216a57a170dd7cea19b3df3.zip | |
Merge branch 'linus' into perf/core, to refresh the branch
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/err.h')
| -rw-r--r-- | include/linux/err.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/err.h b/include/linux/err.h index 56762ab41713..1e3558845e4c 100644 --- a/include/linux/err.h +++ b/include/linux/err.h @@ -18,7 +18,7 @@ #ifndef __ASSEMBLY__ -#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO) +#define IS_ERR_VALUE(x) unlikely((unsigned long)(void *)(x) >= (unsigned long)-MAX_ERRNO) static inline void * __must_check ERR_PTR(long error) { |