diff options
author | jhb <jhb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f> | 2020-12-17 20:28:53 +0000 |
---|---|---|
committer | jhb <jhb@ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f> | 2020-12-17 20:28:53 +0000 |
commit | e276f7266956076e6139c27e8dab6893be21e58a (patch) | |
tree | 1445d4d940aa3428cd47da5b2dbb2098b83a62b8 | |
parent | d6026b81564a8a80b9b8ddc1e3b786e8f006d466 (diff) | |
download | freebsd-e276f7266956076e6139c27e8dab6893be21e58a.tar.gz freebsd-e276f7266956076e6139c27e8dab6893be21e58a.tar.bz2 |
Cleanups to *ERR* compat shims.
- Use [u]intptr_t casts to convert pointers to integers.
- Change IS_ERR* to return bool instead of long.
Reviewed by: manu
Obtained from: CheriBSD
Sponsored by: DARPA
Differential Revision: https://reviews.freebsd.org/D27577
git-svn-id: http://svn.freebsd.org/base/head@368738 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
-rw-r--r-- | sys/compat/linuxkpi/common/include/linux/err.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/compat/linuxkpi/common/include/linux/err.h b/sys/compat/linuxkpi/common/include/linux/err.h index 5f71ebf59b5..40a8ba82dfd 100644 --- a/sys/compat/linuxkpi/common/include/linux/err.h +++ b/sys/compat/linuxkpi/common/include/linux/err.h @@ -37,30 +37,30 @@ #define MAX_ERRNO 4095 -#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO) +#define IS_ERR_VALUE(x) unlikely((x) >= (uintptr_t)-MAX_ERRNO) static inline void * ERR_PTR(long error) { - return (void *)error; + return (void *)(intptr_t)error; } static inline long PTR_ERR(const void *ptr) { - return (long)ptr; + return (intptr_t)ptr; } -static inline long +static inline bool IS_ERR(const void *ptr) { - return IS_ERR_VALUE((unsigned long)ptr); + return IS_ERR_VALUE((uintptr_t)ptr); } -static inline long +static inline bool IS_ERR_OR_NULL(const void *ptr) { - return !ptr || IS_ERR_VALUE((unsigned long)ptr); + return !ptr || IS_ERR_VALUE((uintptr_t)ptr); } static inline void * |