summaryrefslogtreecommitdiffstats
path: root/include/linux/err.h
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-19 22:43:37 -0700
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-19 22:43:37 -0700
commit07ab67c8d0d7c1021343b7d5c045033d6bf7be69 (patch)
tree5857098ebbb760afc8b0d722f119e06b3d1f6511 /include/linux/err.h
parent66e60f92518268f4d2a702a1c4ffbe1caacd6290 (diff)
downloadblackbird-op-linux-07ab67c8d0d7c1021343b7d5c045033d6bf7be69.tar.gz
blackbird-op-linux-07ab67c8d0d7c1021343b7d5c045033d6bf7be69.zip
Fix get_unmapped_area sanity tests
As noted by Chris Wright, we need to do the full range of tests regardless of whether MAP_FIXED is set or not, so re-organize get_unmapped_area() slightly to do the sanity checks unconditionally.
Diffstat (limited to 'include/linux/err.h')
-rw-r--r--include/linux/err.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/linux/err.h b/include/linux/err.h
index 17c55df13615..ff71d2af5da3 100644
--- a/include/linux/err.h
+++ b/include/linux/err.h
@@ -13,6 +13,8 @@
* This should be a per-architecture thing, to allow different
* error and pointer decisions.
*/
+#define IS_ERR_VALUE(x) unlikely((x) > (unsigned long)-1000L)
+
static inline void *ERR_PTR(long error)
{
return (void *) error;
@@ -25,7 +27,7 @@ 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);
}
#endif /* _LINUX_ERR_H */
OpenPOWER on IntegriCloud