Merge ../linus

[linux-2.6-omap-h63xx.git] / include / asm-parisc / errno.h

diff --git a/include/asm-parisc/errno.h b/include/asm-parisc/errno.h
index a10f109770f11ab2e348fc4b2783f61cc54cfdb2..e2f3ddc796be0082a685c43a40a1e42c10a69357 100644 (file)
--- a/include/asm-parisc/errno.h
+++ b/include/asm-parisc/errno.h
@@ -114,6 +114,11 @@
 
 #define ENOTSUP                252     /* Function not implemented (POSIX.4 / HPUX) */
 #define ECANCELLED     253     /* aio request was canceled before complete (POSIX.4 / HPUX) */
+#define ECANCELED      ECANCELLED      /* SuSv3 and Solaris wants one 'L' */
+
+/* for robust mutexes */
+#define EOWNERDEAD     254     /* Owner died */
+#define ENOTRECOVERABLE        255     /* State not recoverable */
 
 
 #endif