vserver 1.9.3

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

diff --git a/include/linux/err.h b/include/linux/err.h
index 92cab64..17c55df 100644 (file)
--- a/include/linux/err.h
+++ b/include/linux/err.h
@@ -1,6 +1,8 @@
 #ifndef _LINUX_ERR_H
 #define _LINUX_ERR_H
 
+#include <linux/compiler.h>
+
 #include <asm/errno.h>
 
 /*
@@ -23,7 +25,7 @@ static inline long PTR_ERR(const void *ptr)
 
 static inline long IS_ERR(const void *ptr)
 {
-       return (unsigned long)ptr > (unsigned long)-1000L;
+       return unlikely((unsigned long)ptr > (unsigned long)-1000L);
 }
 
 #endif /* _LINUX_ERR_H */