Index: sys/compat/linuxkpi/common/include/linux/err.h
===================================================================
--- sys/compat/linuxkpi/common/include/linux/err.h
+++ 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)
+ERR_PTR(intptr_t error)
 {
 	return (void *)error;
 }
 
-static inline long
+static inline intptr_t
 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 *