2 files changed, 2 insertions, 146 deletions
diff --git a/include/asm-xtensa/errno.h b/include/asm-xtensa/errno.h
index ced5194d2750..a0f3b96b79b4 100644
--- a/include/asm-xtensa/errno.h
+++ b/include/asm-xtensa/errno.h
@@ -11,132 +11,6 @@
 #ifndef _XTENSA_ERRNO_H
 #define _XTENSA_ERRNO_H
-#define EPERM            1      /* Operation not permitted */
+#include <asm-generic/errno.h>
-#define ENOENT           2      /* No such file or directory */
-#define ESRCH            3      /* No such process */
-#define EINTR            4      /* Interrupted system call */
-#define EIO              5      /* I/O error */
-#define ENXIO            6      /* No such device or address */
-#define E2BIG            7      /* Arg list too long */
-#define ENOEXEC          8      /* Exec format error */
-#define EBADF            9      /* Bad file number */
-#define ECHILD          10      /* No child processes */
-#define EAGAIN          11      /* Try again */
-#define ENOMEM          12      /* Out of memory */
-#define EACCES          13      /* Permission denied */
-#define EFAULT          14      /* Bad address */
-#define ENOTBLK         15      /* Block device required */
-#define EBUSY           16      /* Device or resource busy */
-#define EEXIST          17      /* File exists */
-#define EXDEV           18      /* Cross-device link */
-#define ENODEV          19      /* No such device */
-#define ENOTDIR         20      /* Not a directory */
-#define EISDIR          21      /* Is a directory */
-#define EINVAL          22      /* Invalid argument */
-#define ENFILE          23      /* File table overflow */
-#define EMFILE          24      /* Too many open files */
-#define ENOTTY          25      /* Not a typewriter */
-#define ETXTBSY         26      /* Text file busy */
-#define EFBIG           27      /* File too large */
-#define ENOSPC          28      /* No space left on device */
-#define ESPIPE          29      /* Illegal seek */
-#define EROFS           30      /* Read-only file system */
-#define EMLINK          31      /* Too many links */
-#define EPIPE           32      /* Broken pipe */
-#define EDOM            33      /* Math argument out of domain of func */
-#define ERANGE          34      /* Math result not representable */
-#define EDEADLK         35      /* Resource deadlock would occur */
-#define ENAMETOOLONG    36      /* File name too long */
-#define ENOLCK          37      /* No record locks available */
-#define ENOSYS          38      /* Function not implemented */
-#define ENOTEMPTY       39      /* Directory not empty */
-#define ELOOP           40      /* Too many symbolic links encountered */
-#define EWOULDBLOCK     EAGAIN  /* Operation would block */
-#define ENOMSG          42      /* No message of desired type */
-#define EIDRM           43      /* Identifier removed */
-#define ECHRNG          44      /* Channel number out of range */
-#define EL2NSYNC        45      /* Level 2 not synchronized */
-#define EL3HLT          46      /* Level 3 halted */
-#define EL3RST          47      /* Level 3 reset */
-#define ELNRNG          48      /* Link number out of range */
-#define EUNATCH         49      /* Protocol driver not attached */
-#define ENOCSI          50      /* No CSI structure available */
-#define EL2HLT          51      /* Level 2 halted */
-#define EBADE           52      /* Invalid exchange */
-#define EBADR           53      /* Invalid request descriptor */
-#define EXFULL          54      /* Exchange full */
-#define ENOANO          55      /* No anode */
-#define EBADRQC         56      /* Invalid request code */
-#define EBADSLT         57      /* Invalid slot */
-#define EDEADLOCK       EDEADLK
-#define EBFONT          59      /* Bad font file format */
-#define ENOSTR          60      /* Device not a stream */
-#define ENODATA         61      /* No data available */
-#define ETIME           62      /* Timer expired */
-#define ENOSR           63      /* Out of streams resources */
-#define ENONET          64      /* Machine is not on the network */
-#define ENOPKG          65      /* Package not installed */
-#define EREMOTE         66      /* Object is remote */
-#define ENOLINK         67      /* Link has been severed */
-#define EADV            68      /* Advertise error */
-#define ESRMNT          69      /* Srmount error */
-#define ECOMM           70      /* Communication error on send */
-#define EPROTO          71      /* Protocol error */
-#define EMULTIHOP       72      /* Multihop attempted */
-#define EDOTDOT         73      /* RFS specific error */
-#define EBADMSG         74      /* Not a data message */
-#define EOVERFLOW       75      /* Value too large for defined data type */
-#define ENOTUNIQ        76      /* Name not unique on network */
-#define EBADFD          77      /* File descriptor in bad state */
-#define EREMCHG         78      /* Remote address changed */
-#define ELIBACC         79      /* Can not access a needed shared library */
-#define ELIBBAD         80      /* Accessing a corrupted shared library */
-#define ELIBSCN         81      /* .lib section in a.out corrupted */
-#define ELIBMAX         82      /* Attempting to link in too many shared libraries */
-#define ELIBEXEC        83      /* Cannot exec a shared library directly */
-#define EILSEQ          84      /* Illegal byte sequence */
-#define ERESTART        85      /* Interrupted system call should be restarted */
-#define ESTRPIPE        86      /* Streams pipe error */
-#define EUSERS          87      /* Too many users */
-#define ENOTSOCK        88      /* Socket operation on non-socket */
-#define EDESTADDRREQ    89      /* Destination address required */
-#define EMSGSIZE        90      /* Message too long */
-#define EPROTOTYPE      91      /* Protocol wrong type for socket */
-#define ENOPROTOOPT     92      /* Protocol not available */
-#define EPROTONOSUPPORT 93      /* Protocol not supported */
-#define ESOCKTNOSUPPORT 94      /* Socket type not supported */
-#define EOPNOTSUPP      95      /* Operation not supported on transport endpoint */
-#define EPFNOSUPPORT    96      /* Protocol family not supported */
-#define EAFNOSUPPORT    97      /* Address family not supported by protocol */
-#define EADDRINUSE      98      /* Address already in use */
-#define EADDRNOTAVAIL   99      /* Cannot assign requested address */
-#define ENETDOWN        100     /* Network is down */
-#define ENETUNREACH     101     /* Network is unreachable */
-#define ENETRESET       102     /* Network dropped connection because of reset */
-#define ECONNABORTED    103     /* Software caused connection abort */
-#define ECONNRESET      104     /* Connection reset by peer */
-#define ENOBUFS         105     /* No buffer space available */
-#define EISCONN         106     /* Transport endpoint is already connected */
-#define ENOTCONN        107     /* Transport endpoint is not connected */
-#define ESHUTDOWN       108     /* Cannot send after transport endpoint shutdown */
-#define ETOOMANYREFS    109     /* Too many references: cannot splice */
-#define ETIMEDOUT       110     /* Connection timed out */
-#define ECONNREFUSED    111     /* Connection refused */
-#define EHOSTDOWN       112     /* Host is down */
-#define EHOSTUNREACH    113     /* No route to host */
-#define EALREADY        114     /* Operation already in progress */
-#define EINPROGRESS     115     /* Operation now in progress */
-#define ESTALE          116     /* Stale NFS file handle */
-#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 EDQUOT          122     /* Quota exceeded */
-#define ENOMEDIUM       123     /* No medium found */
-#define EMEDIUMTYPE     124     /* Wrong medium type */
 #endif  /* _XTENSA_ERRNO_H */
diff --git a/include/asm-xtensa/ipc.h b/include/asm-xtensa/ipc.h
index d37bdb4d4c9c..a9eed4e21cb9 100644
--- a/include/asm-xtensa/ipc.h
+++ b/include/asm-xtensa/ipc.h
@@ -11,24 +11,6 @@
 #ifndef _XTENSA_IPC_H
 #define _XTENSA_IPC_H
-struct ipc_kludge {
+#include <asm-generic/ipc.h>
-        struct msgbuf __user *msgp;
-        long msgtyp;
-};
-#define SEMOP            1
-#define SEMGET           2
-#define SEMCTL           3
-#define SEMTIMEDOP       4
-#define MSGSND          11
-#define MSGRCV          12
-#define MSGGET          13
-#define MSGCTL          14
-#define SHMAT           21
-#define SHMDT           22
-#define SHMGET          23
-#define SHMCTL          24
-#define IPCCALL(version,op)     ((version)<<16 | (op))
 #endif  /* _XTENSA_IPC_H */

diff --git a/include/asm-xtensa/errno.h b/include/asm-xtensa/errno.h index ced5194d2750..a0f3b96b79b4 100644 --- a/include/asm-xtensa/errno.h +++ b/include/asm-xtensa/errno.h
@@ -11,132 +11,6 @@
11	#ifndef _XTENSA_ERRNO_H	11	#ifndef _XTENSA_ERRNO_H
12	#define _XTENSA_ERRNO_H	12	#define _XTENSA_ERRNO_H
13		13
14	#define EPERM 1 /* Operation not permitted */	14	#include <asm-generic/errno.h>
15	#define ENOENT 2 /* No such file or directory */
16	#define ESRCH 3 /* No such process */
17	#define EINTR 4 /* Interrupted system call */
18	#define EIO 5 /* I/O error */
19	#define ENXIO 6 /* No such device or address */
20	#define E2BIG 7 /* Arg list too long */
21	#define ENOEXEC 8 /* Exec format error */
22	#define EBADF 9 /* Bad file number */
23	#define ECHILD 10 /* No child processes */
24	#define EAGAIN 11 /* Try again */
25	#define ENOMEM 12 /* Out of memory */
26	#define EACCES 13 /* Permission denied */
27	#define EFAULT 14 /* Bad address */
28	#define ENOTBLK 15 /* Block device required */
29	#define EBUSY 16 /* Device or resource busy */
30	#define EEXIST 17 /* File exists */
31	#define EXDEV 18 /* Cross-device link */
32	#define ENODEV 19 /* No such device */
33	#define ENOTDIR 20 /* Not a directory */
34	#define EISDIR 21 /* Is a directory */
35	#define EINVAL 22 /* Invalid argument */
36	#define ENFILE 23 /* File table overflow */
37	#define EMFILE 24 /* Too many open files */
38	#define ENOTTY 25 /* Not a typewriter */
39	#define ETXTBSY 26 /* Text file busy */
40	#define EFBIG 27 /* File too large */
41	#define ENOSPC 28 /* No space left on device */
42	#define ESPIPE 29 /* Illegal seek */
43	#define EROFS 30 /* Read-only file system */
44	#define EMLINK 31 /* Too many links */
45	#define EPIPE 32 /* Broken pipe */
46	#define EDOM 33 /* Math argument out of domain of func */
47	#define ERANGE 34 /* Math result not representable */
48	#define EDEADLK 35 /* Resource deadlock would occur */
49	#define ENAMETOOLONG 36 /* File name too long */
50	#define ENOLCK 37 /* No record locks available */
51	#define ENOSYS 38 /* Function not implemented */
52	#define ENOTEMPTY 39 /* Directory not empty */
53	#define ELOOP 40 /* Too many symbolic links encountered */
54	#define EWOULDBLOCK EAGAIN /* Operation would block */
55	#define ENOMSG 42 /* No message of desired type */
56	#define EIDRM 43 /* Identifier removed */
57	#define ECHRNG 44 /* Channel number out of range */
58	#define EL2NSYNC 45 /* Level 2 not synchronized */
59	#define EL3HLT 46 /* Level 3 halted */
60	#define EL3RST 47 /* Level 3 reset */
61	#define ELNRNG 48 /* Link number out of range */
62	#define EUNATCH 49 /* Protocol driver not attached */
63	#define ENOCSI 50 /* No CSI structure available */
64	#define EL2HLT 51 /* Level 2 halted */
65	#define EBADE 52 /* Invalid exchange */
66	#define EBADR 53 /* Invalid request descriptor */
67	#define EXFULL 54 /* Exchange full */
68	#define ENOANO 55 /* No anode */
69	#define EBADRQC 56 /* Invalid request code */
70	#define EBADSLT 57 /* Invalid slot */
71
72	#define EDEADLOCK EDEADLK
73
74	#define EBFONT 59 /* Bad font file format */
75	#define ENOSTR 60 /* Device not a stream */
76	#define ENODATA 61 /* No data available */
77	#define ETIME 62 /* Timer expired */
78	#define ENOSR 63 /* Out of streams resources */
79	#define ENONET 64 /* Machine is not on the network */
80	#define ENOPKG 65 /* Package not installed */
81	#define EREMOTE 66 /* Object is remote */
82	#define ENOLINK 67 /* Link has been severed */
83	#define EADV 68 /* Advertise error */
84	#define ESRMNT 69 /* Srmount error */
85	#define ECOMM 70 /* Communication error on send */
86	#define EPROTO 71 /* Protocol error */
87	#define EMULTIHOP 72 /* Multihop attempted */
88	#define EDOTDOT 73 /* RFS specific error */
89	#define EBADMSG 74 /* Not a data message */
90	#define EOVERFLOW 75 /* Value too large for defined data type */
91	#define ENOTUNIQ 76 /* Name not unique on network */
92	#define EBADFD 77 /* File descriptor in bad state */
93	#define EREMCHG 78 /* Remote address changed */
94	#define ELIBACC 79 /* Can not access a needed shared library */
95	#define ELIBBAD 80 /* Accessing a corrupted shared library */
96	#define ELIBSCN 81 /* .lib section in a.out corrupted */
97	#define ELIBMAX 82 /* Attempting to link in too many shared libraries */
98	#define ELIBEXEC 83 /* Cannot exec a shared library directly */
99	#define EILSEQ 84 /* Illegal byte sequence */
100	#define ERESTART 85 /* Interrupted system call should be restarted */
101	#define ESTRPIPE 86 /* Streams pipe error */
102	#define EUSERS 87 /* Too many users */
103	#define ENOTSOCK 88 /* Socket operation on non-socket */
104	#define EDESTADDRREQ 89 /* Destination address required */
105	#define EMSGSIZE 90 /* Message too long */
106	#define EPROTOTYPE 91 /* Protocol wrong type for socket */
107	#define ENOPROTOOPT 92 /* Protocol not available */
108	#define EPROTONOSUPPORT 93 /* Protocol not supported */
109	#define ESOCKTNOSUPPORT 94 /* Socket type not supported */
110	#define EOPNOTSUPP 95 /* Operation not supported on transport endpoint */
111	#define EPFNOSUPPORT 96 /* Protocol family not supported */
112	#define EAFNOSUPPORT 97 /* Address family not supported by protocol */
113	#define EADDRINUSE 98 /* Address already in use */
114	#define EADDRNOTAVAIL 99 /* Cannot assign requested address */
115	#define ENETDOWN 100 /* Network is down */
116	#define ENETUNREACH 101 /* Network is unreachable */
117	#define ENETRESET 102 /* Network dropped connection because of reset */
118	#define ECONNABORTED 103 /* Software caused connection abort */
119	#define ECONNRESET 104 /* Connection reset by peer */
120	#define ENOBUFS 105 /* No buffer space available */
121	#define EISCONN 106 /* Transport endpoint is already connected */
122	#define ENOTCONN 107 /* Transport endpoint is not connected */
123	#define ESHUTDOWN 108 /* Cannot send after transport endpoint shutdown */
124	#define ETOOMANYREFS 109 /* Too many references: cannot splice */
125	#define ETIMEDOUT 110 /* Connection timed out */
126	#define ECONNREFUSED 111 /* Connection refused */
127	#define EHOSTDOWN 112 /* Host is down */
128	#define EHOSTUNREACH 113 /* No route to host */
129	#define EALREADY 114 /* Operation already in progress */
130	#define EINPROGRESS 115 /* Operation now in progress */
131	#define ESTALE 116 /* Stale NFS file handle */
132	#define EUCLEAN 117 /* Structure needs cleaning */
133	#define ENOTNAM 118 /* Not a XENIX named type file */
134	#define ENAVAIL 119 /* No XENIX semaphores available */
135	#define EISNAM 120 /* Is a named type file */
136	#define EREMOTEIO 121 /* Remote I/O error */
137	#define EDQUOT 122 /* Quota exceeded */
138
139	#define ENOMEDIUM 123 /* No medium found */
140	#define EMEDIUMTYPE 124 /* Wrong medium type */
141		15
142	#endif /* _XTENSA_ERRNO_H */	16	#endif /* _XTENSA_ERRNO_H */


diff --git a/include/asm-xtensa/ipc.h b/include/asm-xtensa/ipc.h index d37bdb4d4c9c..a9eed4e21cb9 100644 --- a/include/asm-xtensa/ipc.h +++ b/include/asm-xtensa/ipc.h
@@ -11,24 +11,6 @@
11	#ifndef _XTENSA_IPC_H	11	#ifndef _XTENSA_IPC_H
12	#define _XTENSA_IPC_H	12	#define _XTENSA_IPC_H
13		13
14	struct ipc_kludge {	14	#include <asm-generic/ipc.h>
15	struct msgbuf __user *msgp;
16	long msgtyp;
17	};
18
19	#define SEMOP 1
20	#define SEMGET 2
21	#define SEMCTL 3
22	#define SEMTIMEDOP 4
23	#define MSGSND 11
24	#define MSGRCV 12
25	#define MSGGET 13
26	#define MSGCTL 14
27	#define SHMAT 21
28	#define SHMDT 22
29	#define SHMGET 23
30	#define SHMCTL 24
31
32	#define IPCCALL(version,op) ((version)<<16 \| (op))
33		15
34	#endif /* _XTENSA_IPC_H */	16	#endif /* _XTENSA_IPC_H */