Merge with /home/shaggy/git/linus-clean/

[linux-2.6] / include / asm-generic / errno.h

diff --git a/include/asm-generic/errno.h b/include/asm-generic/errno.h
index 4dd2384bc38d45a9be0c9763665208c455bd0249..e8852c092fea913dc529fb49a04fa84b376a13cd 100644 (file)
--- a/include/asm-generic/errno.h
+++ b/include/asm-generic/errno.h
@@ -102,4 +102,8 @@
 #define        EKEYREVOKED     128     /* Key has been revoked */
 #define        EKEYREJECTED    129     /* Key was rejected by service */
 
+/* for robust mutexes */
+#define        EOWNERDEAD      130     /* Owner died */
+#define        ENOTRECOVERABLE 131     /* State not recoverable */
+
 #endif