From de66c9a118f8d5ebeb768cf416ecc1938ef1eb76 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Thu, 17 Dec 2020 20:28:53 +0000 Subject: [PATCH] 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 --- sys/compat/linuxkpi/common/include/linux/err.h | 14 +++++++------- 1 file 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 * -- 2.45.0