git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'devel' of master.kernel.org:/home/rmk/linux-2.6-arm
[sfrench/cifs-2.6.git]
/
include
/
linux
/
err.h
diff --git
a/include/linux/err.h
b/include/linux/err.h
index cd3b367f7445e5aa0f25ddbf2f0b96c44a19b94f..1ab1d44f8d3be7a28c8a1a849c72e1f841424015 100644
(file)
--- a/
include/linux/err.h
+++ b/
include/linux/err.h
@@
-15,6
+15,8
@@
*/
#define MAX_ERRNO 4095
+#ifndef __ASSEMBLY__
+
#define IS_ERR_VALUE(x) unlikely((x) >= (unsigned long)-MAX_ERRNO)
static inline void *ERR_PTR(long error)
@@
-32,4
+34,6
@@
static inline long IS_ERR(const void *ptr)
return IS_ERR_VALUE((unsigned long)ptr);
}
+#endif
+
#endif /* _LINUX_ERR_H */