[SPARC]: Merge asm-sparc{,64}/errno.h

Signed-off-by: David S. Miller <davem@davemloft.net>
author: David S. Miller <davem@sunset.davemloft.net> 2007-11-16 06:24:23 -0500
committer: David S. Miller <davem@davemloft.net> 2008-02-09 07:18:23 -0500
commit: 3cfe17fdf192bc8f69305d56a09a4cbb1edc57b8 (patch)
tree: 4abf64adb2dbde3695bc2b9f1d1bf4e813c45b06
parent: f11fa82708df824612929d3290ce29d8b3c368fc (diff)
2 files changed, 1 insertions, 115 deletions
diff --git a/include/asm-sparc/errno.h b/include/asm-sparc/errno.h
index ed41c8bac1fa..a9ef172977de 100644
--- a/include/asm-sparc/errno.h
+++ b/include/asm-sparc/errno.h
@@ -1,4 +1,3 @@
-/* $Id: errno.h,v 1.6 1997/04/15 09:03:38 davem Exp $ */
 #ifndef _SPARC_ERRNO_H
 #define _SPARC_ERRNO_H
diff --git a/include/asm-sparc64/errno.h b/include/asm-sparc64/errno.h
index ea3509ee1b0b..9701fe01cc53 100644
--- a/include/asm-sparc64/errno.h
+++ b/include/asm-sparc64/errno.h
@@ -1,114 +1 @@
-/* $Id: errno.h,v 1.2 1997/04/15 12:46:11 jj Exp $ */
+#include <asm-sparc/errno.h>
-#ifndef _SPARC64_ERRNO_H
-#define _SPARC64_ERRNO_H
-/* These match the SunOS error numbering scheme. */
-#include <asm-generic/errno-base.h>
-#define EWOULDBLOCK     EAGAIN  /* Operation would block */
-#define EINPROGRESS     36      /* Operation now in progress */
-#define EALREADY        37      /* Operation already in progress */
-#define ENOTSOCK        38      /* Socket operation on non-socket */
-#define EDESTADDRREQ    39      /* Destination address required */
-#define EMSGSIZE        40      /* Message too long */
-#define EPROTOTYPE      41      /* Protocol wrong type for socket */
-#define ENOPROTOOPT     42      /* Protocol not available */
-#define EPROTONOSUPPORT 43      /* Protocol not supported */
-#define ESOCKTNOSUPPORT 44      /* Socket type not supported */
-#define EOPNOTSUPP      45      /* Op not supported on transport endpoint */
-#define EPFNOSUPPORT    46      /* Protocol family not supported */
-#define EAFNOSUPPORT    47      /* Address family not supported by protocol */
-#define EADDRINUSE      48      /* Address already in use */
-#define EADDRNOTAVAIL   49      /* Cannot assign requested address */
-#define ENETDOWN        50      /* Network is down */
-#define ENETUNREACH     51      /* Network is unreachable */
-#define ENETRESET       52      /* Net dropped connection because of reset */
-#define ECONNABORTED    53      /* Software caused connection abort */
-#define ECONNRESET      54      /* Connection reset by peer */
-#define ENOBUFS         55      /* No buffer space available */
-#define EISCONN         56      /* Transport endpoint is already connected */
-#define ENOTCONN        57      /* Transport endpoint is not connected */
-#define ESHUTDOWN       58      /* No send after transport endpoint shutdown */
-#define ETOOMANYREFS    59      /* Too many references: cannot splice */
-#define ETIMEDOUT       60      /* Connection timed out */
-#define ECONNREFUSED    61      /* Connection refused */
-#define ELOOP           62      /* Too many symbolic links encountered */
-#define ENAMETOOLONG    63      /* File name too long */
-#define EHOSTDOWN       64      /* Host is down */
-#define EHOSTUNREACH    65      /* No route to host */
-#define ENOTEMPTY       66      /* Directory not empty */
-#define EPROCLIM        67      /* SUNOS: Too many processes */
-#define EUSERS          68      /* Too many users */
-#define EDQUOT          69      /* Quota exceeded */
-#define ESTALE          70      /* Stale NFS file handle */
-#define EREMOTE         71      /* Object is remote */
-#define ENOSTR          72      /* Device not a stream */
-#define ETIME           73      /* Timer expired */
-#define ENOSR           74      /* Out of streams resources */
-#define ENOMSG          75      /* No message of desired type */
-#define EBADMSG         76      /* Not a data message */
-#define EIDRM           77      /* Identifier removed */
-#define EDEADLK         78      /* Resource deadlock would occur */
-#define ENOLCK          79      /* No record locks available */
-#define ENONET          80      /* Machine is not on the network */
-#define ERREMOTE        81      /* SunOS: Too many lvls of remote in path */
-#define ENOLINK         82      /* Link has been severed */
-#define EADV            83      /* Advertise error */
-#define ESRMNT          84      /* Srmount error */
-#define ECOMM           85      /* Communication error on send */
-#define EPROTO          86      /* Protocol error */
-#define EMULTIHOP       87      /* Multihop attempted */
-#define EDOTDOT         88      /* RFS specific error */
-#define EREMCHG         89      /* Remote address changed */
-#define ENOSYS          90      /* Function not implemented */
-/* The rest have no SunOS equivalent. */
-#define ESTRPIPE        91      /* Streams pipe error */
-#define EOVERFLOW       92      /* Value too large for defined data type */
-#define EBADFD          93      /* File descriptor in bad state */
-#define ECHRNG          94      /* Channel number out of range */
-#define EL2NSYNC        95      /* Level 2 not synchronized */
-#define EL3HLT          96      /* Level 3 halted */
-#define EL3RST          97      /* Level 3 reset */
-#define ELNRNG          98      /* Link number out of range */
-#define EUNATCH         99      /* Protocol driver not attached */
-#define ENOCSI          100     /* No CSI structure available */
-#define EL2HLT          101     /* Level 2 halted */
-#define EBADE           102     /* Invalid exchange */
-#define EBADR           103     /* Invalid request descriptor */
-#define EXFULL          104     /* Exchange full */
-#define ENOANO          105     /* No anode */
-#define EBADRQC         106     /* Invalid request code */
-#define EBADSLT         107     /* Invalid slot */
-#define EDEADLOCK       108     /* File locking deadlock error */
-#define EBFONT          109     /* Bad font file format */
-#define ELIBEXEC        110     /* Cannot exec a shared library directly */
-#define ENODATA         111     /* No data available */
-#define ELIBBAD         112     /* Accessing a corrupted shared library */
-#define ENOPKG          113     /* Package not installed */
-#define ELIBACC         114     /* Can not access a needed shared library */
-#define ENOTUNIQ        115     /* Name not unique on network */
-#define ERESTART        116     /* Interrupted syscall should be restarted */
-#define EUCLEAN         117     /* Structure needs cleaning */
-#define ENOTNAM         118     /* Not a XENIX named type file */
-#define ENAVAIL         119     /* No XENIX semaphores available */
-#define EISNAM          120     /* Is a named type file */
-#define EREMOTEIO       121     /* Remote I/O error */
-#define EILSEQ          122     /* Illegal byte sequence */
-#define ELIBMAX         123     /* Atmpt to link in too many shared libs */
-#define ELIBSCN         124     /* .lib section in a.out corrupted */
-#define ENOMEDIUM       125     /* No medium found */
-#define EMEDIUMTYPE     126     /* Wrong medium type */
-#define ECANCELED       127     /* Operation Cancelled */
-#define ENOKEY          128     /* Required key not available */
-#define EKEYEXPIRED     129     /* Key has expired */
-#define EKEYREVOKED     130     /* Key has been revoked */
-#define EKEYREJECTED    131     /* Key was rejected by service */
-/* for robust mutexes */
-#define EOWNERDEAD      132     /* Owner died */
-#define ENOTRECOVERABLE 133     /* State not recoverable */
-#endif /* !(_SPARC64_ERRNO_H) */
author	David S. Miller <davem@sunset.davemloft.net>	2007-11-16 06:24:23 -0500
committer	David S. Miller <davem@davemloft.net>	2008-02-09 07:18:23 -0500
commit	3cfe17fdf192bc8f69305d56a09a4cbb1edc57b8 (patch)
tree	4abf64adb2dbde3695bc2b9f1d1bf4e813c45b06
parent	f11fa82708df824612929d3290ce29d8b3c368fc (diff)

diff --git a/include/asm-sparc/errno.h b/include/asm-sparc/errno.h index ed41c8bac1fa..a9ef172977de 100644 --- a/include/asm-sparc/errno.h +++ b/include/asm-sparc/errno.h
@@ -1,4 +1,3 @@
1	/* $Id: errno.h,v 1.6 1997/04/15 09:03:38 davem Exp $ */
2	#ifndef _SPARC_ERRNO_H	1	#ifndef _SPARC_ERRNO_H
3	#define _SPARC_ERRNO_H	2	#define _SPARC_ERRNO_H
4		3


diff --git a/include/asm-sparc64/errno.h b/include/asm-sparc64/errno.h index ea3509ee1b0b..9701fe01cc53 100644 --- a/include/asm-sparc64/errno.h +++ b/include/asm-sparc64/errno.h
@@ -1,114 +1 @@
1	/* $Id: errno.h,v 1.2 1997/04/15 12:46:11 jj Exp $ */		#include <asm-sparc/errno.h>
2	#ifndef _SPARC64_ERRNO_H
3	#define _SPARC64_ERRNO_H
4
5	/* These match the SunOS error numbering scheme. */
6
7	#include <asm-generic/errno-base.h>
8
9	#define EWOULDBLOCK EAGAIN /* Operation would block */
10	#define EINPROGRESS 36 /* Operation now in progress */
11	#define EALREADY 37 /* Operation already in progress */
12	#define ENOTSOCK 38 /* Socket operation on non-socket */
13	#define EDESTADDRREQ 39 /* Destination address required */
14	#define EMSGSIZE 40 /* Message too long */
15	#define EPROTOTYPE 41 /* Protocol wrong type for socket */
16	#define ENOPROTOOPT 42 /* Protocol not available */
17	#define EPROTONOSUPPORT 43 /* Protocol not supported */
18	#define ESOCKTNOSUPPORT 44 /* Socket type not supported */
19	#define EOPNOTSUPP 45 /* Op not supported on transport endpoint */
20	#define EPFNOSUPPORT 46 /* Protocol family not supported */
21	#define EAFNOSUPPORT 47 /* Address family not supported by protocol */
22	#define EADDRINUSE 48 /* Address already in use */
23	#define EADDRNOTAVAIL 49 /* Cannot assign requested address */
24	#define ENETDOWN 50 /* Network is down */
25	#define ENETUNREACH 51 /* Network is unreachable */
26	#define ENETRESET 52 /* Net dropped connection because of reset */
27	#define ECONNABORTED 53 /* Software caused connection abort */
28	#define ECONNRESET 54 /* Connection reset by peer */
29	#define ENOBUFS 55 /* No buffer space available */
30	#define EISCONN 56 /* Transport endpoint is already connected */
31	#define ENOTCONN 57 /* Transport endpoint is not connected */
32	#define ESHUTDOWN 58 /* No send after transport endpoint shutdown */
33	#define ETOOMANYREFS 59 /* Too many references: cannot splice */
34	#define ETIMEDOUT 60 /* Connection timed out */
35	#define ECONNREFUSED 61 /* Connection refused */
36	#define ELOOP 62 /* Too many symbolic links encountered */
37	#define ENAMETOOLONG 63 /* File name too long */
38	#define EHOSTDOWN 64 /* Host is down */
39	#define EHOSTUNREACH 65 /* No route to host */
40	#define ENOTEMPTY 66 /* Directory not empty */
41	#define EPROCLIM 67 /* SUNOS: Too many processes */
42	#define EUSERS 68 /* Too many users */
43	#define EDQUOT 69 /* Quota exceeded */
44	#define ESTALE 70 /* Stale NFS file handle */
45	#define EREMOTE 71 /* Object is remote */
46	#define ENOSTR 72 /* Device not a stream */
47	#define ETIME 73 /* Timer expired */
48	#define ENOSR 74 /* Out of streams resources */
49	#define ENOMSG 75 /* No message of desired type */
50	#define EBADMSG 76 /* Not a data message */
51	#define EIDRM 77 /* Identifier removed */
52	#define EDEADLK 78 /* Resource deadlock would occur */
53	#define ENOLCK 79 /* No record locks available */
54	#define ENONET 80 /* Machine is not on the network */
55	#define ERREMOTE 81 /* SunOS: Too many lvls of remote in path */
56	#define ENOLINK 82 /* Link has been severed */
57	#define EADV 83 /* Advertise error */
58	#define ESRMNT 84 /* Srmount error */
59	#define ECOMM 85 /* Communication error on send */
60	#define EPROTO 86 /* Protocol error */
61	#define EMULTIHOP 87 /* Multihop attempted */
62	#define EDOTDOT 88 /* RFS specific error */
63	#define EREMCHG 89 /* Remote address changed */
64	#define ENOSYS 90 /* Function not implemented */
65
66	/* The rest have no SunOS equivalent. */
67	#define ESTRPIPE 91 /* Streams pipe error */
68	#define EOVERFLOW 92 /* Value too large for defined data type */
69	#define EBADFD 93 /* File descriptor in bad state */
70	#define ECHRNG 94 /* Channel number out of range */
71	#define EL2NSYNC 95 /* Level 2 not synchronized */
72	#define EL3HLT 96 /* Level 3 halted */
73	#define EL3RST 97 /* Level 3 reset */
74	#define ELNRNG 98 /* Link number out of range */
75	#define EUNATCH 99 /* Protocol driver not attached */
76	#define ENOCSI 100 /* No CSI structure available */
77	#define EL2HLT 101 /* Level 2 halted */
78	#define EBADE 102 /* Invalid exchange */
79	#define EBADR 103 /* Invalid request descriptor */
80	#define EXFULL 104 /* Exchange full */
81	#define ENOANO 105 /* No anode */
82	#define EBADRQC 106 /* Invalid request code */
83	#define EBADSLT 107 /* Invalid slot */
84	#define EDEADLOCK 108 /* File locking deadlock error */
85	#define EBFONT 109 /* Bad font file format */
86	#define ELIBEXEC 110 /* Cannot exec a shared library directly */
87	#define ENODATA 111 /* No data available */
88	#define ELIBBAD 112 /* Accessing a corrupted shared library */
89	#define ENOPKG 113 /* Package not installed */
90	#define ELIBACC 114 /* Can not access a needed shared library */
91	#define ENOTUNIQ 115 /* Name not unique on network */
92	#define ERESTART 116 /* Interrupted syscall should be restarted */
93	#define EUCLEAN 117 /* Structure needs cleaning */
94	#define ENOTNAM 118 /* Not a XENIX named type file */
95	#define ENAVAIL 119 /* No XENIX semaphores available */
96	#define EISNAM 120 /* Is a named type file */
97	#define EREMOTEIO 121 /* Remote I/O error */
98	#define EILSEQ 122 /* Illegal byte sequence */
99	#define ELIBMAX 123 /* Atmpt to link in too many shared libs */
100	#define ELIBSCN 124 /* .lib section in a.out corrupted */
101
102	#define ENOMEDIUM 125 /* No medium found */
103	#define EMEDIUMTYPE 126 /* Wrong medium type */
104	#define ECANCELED 127 /* Operation Cancelled */
105	#define ENOKEY 128 /* Required key not available */
106	#define EKEYEXPIRED 129 /* Key has expired */
107	#define EKEYREVOKED 130 /* Key has been revoked */
108	#define EKEYREJECTED 131 /* Key was rejected by service */
109
110	/* for robust mutexes */
111	#define EOWNERDEAD 132 /* Owner died */
112	#define ENOTRECOVERABLE 133 /* State not recoverable */
113
114	#endif /* !(_SPARC64_ERRNO_H) */