fix hppfs Makefile breakage

[linux-2.6] / include / linux / err.h

diff --git a/include/linux/err.h b/include/linux/err.h
index 17c55df13615a9bda172e80c6f4711c11f3183e8..ec87f3142bf30940c31911e71e6638d749de8f04 100644 (file)
--- a/include/linux/err.h
+++ b/include/linux/err.h
@@ -13,6 +13,12 @@
  * This should be a per-architecture thing, to allow different
  * error and pointer decisions.
  */
+#define MAX_ERRNO      4095
+
+#ifndef __ASSEMBLY__
+
+#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
+
 static inline void *ERR_PTR(long error)
 {
        return (void *) error;
@@ -25,7 +31,22 @@ static inline long PTR_ERR(const void *ptr)
 
 static inline long IS_ERR(const void *ptr)
 {
-       return unlikely((unsigned long)ptr > (unsigned long)-1000L);
+       return IS_ERR_VALUE((unsigned long)ptr);
 }
 
+/**
+ * ERR_CAST - Explicitly cast an error-valued pointer to another pointer type
+ * @ptr: The pointer to cast.
+ *
+ * Explicitly cast an error-valued pointer to another pointer type in such a
+ * way as to make it clear that's what's going on.
+ */
+static inline void *ERR_CAST(const void *ptr)
+{
+       /* cast away the const */
+       return (void *) ptr;
+}
+
+#endif
+
 #endif /* _LINUX_ERR_H */