diff options
| author | njoly <njoly@NetBSD.org> | 2013-12-17 22:14:24 +0000 |
|---|---|---|
| committer | njoly <njoly@NetBSD.org> | 2013-12-17 22:14:24 +0000 |
| commit | 2eb7ffbb7a1905a6a84d77f7c914cfb4d93ea84c (patch) | |
| tree | c590c6302d4fcaf3ccba65486c52f9cbf305fffe /sys/compat/linux/common | |
| parent | 4afb5b587b2932679078ff39ef775a9310f94361 (diff) | |
Cleanup compat linux errnos by adding generic errnos in a single file.
Use it for all arches except alpha and mips.
Add a few missing native to linux errno conversions.
Diffstat (limited to 'sys/compat/linux/common')
| -rw-r--r-- | sys/compat/linux/common/linux_errno.c | 27 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_errno.h | 8 | ||||
| -rw-r--r-- | sys/compat/linux/common/linux_errno_generic.h | 140 |
3 files changed, 161 insertions, 14 deletions
diff --git a/sys/compat/linux/common/linux_errno.c b/sys/compat/linux/common/linux_errno.c index 834ee157910..f037222b16e 100644 --- a/sys/compat/linux/common/linux_errno.c +++ b/sys/compat/linux/common/linux_errno.c @@ -1,4 +1,4 @@ -/* $NetBSD: linux_errno.c,v 1.13 2008/04/28 20:23:43 martin Exp $ */ +/* $NetBSD: linux_errno.c,v 1.14 2013/12/17 22:14:24 njoly Exp $ */ /*- * Copyright (c) 1995 The NetBSD Foundation, Inc. @@ -30,7 +30,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: linux_errno.c,v 1.13 2008/04/28 20:23:43 martin Exp $"); +__KERNEL_RCSID(0, "$NetBSD: linux_errno.c,v 1.14 2013/12/17 22:14:24 njoly Exp $"); #include <compat/linux/common/linux_errno.h> @@ -123,6 +123,19 @@ const int native_to_linux_errno[] = { LINUX_SCERR_SIGN LINUX_ENOSYS, /* not mapped (ENEEDAUTH) */ LINUX_SCERR_SIGN LINUX_EIDRM, LINUX_SCERR_SIGN LINUX_ENOMSG, /* 83 */ + LINUX_SCERR_SIGN LINUX_EOVERFLOW, + LINUX_SCERR_SIGN LINUX_EILSEQ, + LINUX_SCERR_SIGN LINUX_ENOTSUP, + LINUX_SCERR_SIGN LINUX_ECANCELED, + LINUX_SCERR_SIGN LINUX_EBADMSG, + LINUX_SCERR_SIGN LINUX_ENODATA, + LINUX_SCERR_SIGN LINUX_ENOSR, + LINUX_SCERR_SIGN LINUX_ENOSTR, + LINUX_SCERR_SIGN LINUX_ETIME, + LINUX_SCERR_SIGN LINUX_ENOSYS, /* not mapped (ENOATTR) */ + LINUX_SCERR_SIGN LINUX_EMULTIHOP, + LINUX_SCERR_SIGN LINUX_ENOLINK, + LINUX_SCERR_SIGN LINUX_EPROTO, /* 96 */ /* * The rest of the list consists of errors that only @@ -147,21 +160,12 @@ const int native_to_linux_errno[] = { LINUX_SCERR_SIGN LINUX_EBADSLT, LINUX_SCERR_SIGN LINUX_EDEADLOCK, LINUX_SCERR_SIGN LINUX_EBFONT, - LINUX_SCERR_SIGN LINUX_ENOSTR, - LINUX_SCERR_SIGN LINUX_ENODATA, - LINUX_SCERR_SIGN LINUX_ETIME, - LINUX_SCERR_SIGN LINUX_ENOSR, LINUX_SCERR_SIGN LINUX_ENONET, LINUX_SCERR_SIGN LINUX_ENOPKG, - LINUX_SCERR_SIGN LINUX_ENOLINK, LINUX_SCERR_SIGN LINUX_EADV, LINUX_SCERR_SIGN LINUX_ESRMNT, LINUX_SCERR_SIGN LINUX_ECOMM, - LINUX_SCERR_SIGN LINUX_EPROTO, - LINUX_SCERR_SIGN LINUX_EMULTIHOP, LINUX_SCERR_SIGN LINUX_EDOTDOT, - LINUX_SCERR_SIGN LINUX_EBADMSG, - LINUX_SCERR_SIGN LINUX_EOVERFLOW, LINUX_SCERR_SIGN LINUX_ENOTUNIQ, LINUX_SCERR_SIGN LINUX_EBADFD, LINUX_SCERR_SIGN LINUX_EREMCHG, @@ -170,7 +174,6 @@ const int native_to_linux_errno[] = { LINUX_SCERR_SIGN LINUX_ELIBSCN, LINUX_SCERR_SIGN LINUX_ELIBMAX, LINUX_SCERR_SIGN LINUX_ELIBEXEC, - LINUX_SCERR_SIGN LINUX_EILSEQ, LINUX_SCERR_SIGN LINUX_ERESTART, LINUX_SCERR_SIGN LINUX_ESTRPIPE, LINUX_SCERR_SIGN LINUX_EUCLEAN, diff --git a/sys/compat/linux/common/linux_errno.h b/sys/compat/linux/common/linux_errno.h index 512b3628dc9..9ea2ed43b72 100644 --- a/sys/compat/linux/common/linux_errno.h +++ b/sys/compat/linux/common/linux_errno.h @@ -1,4 +1,4 @@ -/* $NetBSD: linux_errno.h,v 1.13 2008/04/28 20:23:43 martin Exp $ */ +/* $NetBSD: linux_errno.h,v 1.14 2013/12/17 22:14:24 njoly Exp $ */ /*- * Copyright (c) 1995, 1998 The NetBSD Foundation, Inc. @@ -86,9 +86,13 @@ #elif defined(__amd64__) #include <compat/linux/arch/amd64/linux_errno.h> #else -#include <compat/linux/arch/i386/linux_errno.h> /* XXX:Allow kdump to compile */ +#define LINUX_SCERR_SIGN - +#include <compat/linux/common/linux_errno_generic.h> #endif +/* Linux has no ENOTSUP error code. */ +#define LINUX_ENOTSUP LINUX_EOPNOTSUPP + extern const int native_to_linux_errno[]; #endif /* !_LINUX_ERRNO_H */ diff --git a/sys/compat/linux/common/linux_errno_generic.h b/sys/compat/linux/common/linux_errno_generic.h new file mode 100644 index 00000000000..4ef52a5a779 --- /dev/null +++ b/sys/compat/linux/common/linux_errno_generic.h @@ -0,0 +1,140 @@ +/* $NetBSD: linux_errno_generic.h,v 1.1 2013/12/17 22:14:24 njoly Exp $ */ + +#ifndef _LINUX_ERRNO_GENERIC_H +#define _LINUX_ERRNO_GENERIC_H + +/*- + * Copyright (c) 2013 The NetBSD Foundation, Inc. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE NETBSD FOUNDATION, INC. AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED + * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS + * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR + * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF + * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS + * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN + * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + */ + +/* From <asm-generic/errno.h> */ + +#define LINUX_EDEADLK 35 /* Resource deadlock would occur */ +#define LINUX_ENAMETOOLONG 36 /* File name too long */ +#define LINUX_ENOLCK 37 /* No record locks available */ +#define LINUX_ENOSYS 38 /* Function not implemented */ +#define LINUX_ENOTEMPTY 39 /* Directory not empty */ +#define LINUX_ELOOP 40 /* Too many symbolic links encountered */ +#define LINUX_EWOULDBLOCK LINUX_EAGAIN /* Operation would block */ +#define LINUX_ENOMSG 42 /* No message of desired type */ +#define LINUX_EIDRM 43 /* Identifier removed */ +#define LINUX_ECHRNG 44 /* Channel number out of range */ +#define LINUX_EL2NSYNC 45 /* Level 2 not synchronized */ +#define LINUX_EL3HLT 46 /* Level 3 halted */ +#define LINUX_EL3RST 47 /* Level 3 reset */ +#define LINUX_ELNRNG 48 /* Link number out of range */ +#define LINUX_EUNATCH 49 /* Protocol driver not attached */ +#define LINUX_ENOCSI 50 /* No CSI structure available */ +#define LINUX_EL2HLT 51 /* Level 2 halted */ +#define LINUX_EBADE 52 /* Invalid exchange */ +#define LINUX_EBADR 53 /* Invalid request descriptor */ +#define LINUX_EXFULL 54 /* Exchange full */ +#define LINUX_ENOANO 55 /* No anode */ +#define LINUX_EBADRQC 56 /* Invalid request code */ +#define LINUX_EBADSLT 57 /* Invalid slot */ + +#define LINUX_EDEADLOCK LINUX_EDEADLK + +#define LINUX_EBFONT 59 /* Bad font file format */ +#define LINUX_ENOSTR 60 /* Device not a stream */ +#define LINUX_ENODATA 61 /* No data available */ +#define LINUX_ETIME 62 /* Timer expired */ +#define LINUX_ENOSR 63 /* Out of streams resources */ +#define LINUX_ENONET 64 /* Machine is not on the network */ +#define LINUX_ENOPKG 65 /* Package not installed */ +#define LINUX_EREMOTE 66 /* Object is remote */ +#define LINUX_ENOLINK 67 /* Link has been severed */ +#define LINUX_EADV 68 /* Advertise error */ +#define LINUX_ESRMNT 69 /* Srmount error */ +#define LINUX_ECOMM 70 /* Communication error on send */ +#define LINUX_EPROTO 71 /* Protocol error */ +#define LINUX_EMULTIHOP 72 /* Multihop attempted */ +#define LINUX_EDOTDOT 73 /* RFS specific error */ +#define LINUX_EBADMSG 74 /* Not a data message */ +#define LINUX_EOVERFLOW 75 /* Value too large for defined data type */ +#define LINUX_ENOTUNIQ 76 /* Name not unique on network */ +#define LINUX_EBADFD 77 /* File descriptor in bad state */ +#define LINUX_EREMCHG 78 /* Remote address changed */ +#define LINUX_ELIBACC 79 /* Can not access a needed shared library */ +#define LINUX_ELIBBAD 80 /* Accessing a corrupted shared library */ +#define LINUX_ELIBSCN 81 /* .lib section in a.out corrupted */ +#define LINUX_ELIBMAX 82 /* Attempting to link in too many shared libraries */ +#define LINUX_ELIBEXEC 83 /* Cannot exec a shared library directly */ +#define LINUX_EILSEQ 84 /* Illegal byte sequence */ +#define LINUX_ERESTART 85 /* Interrupted system call should be restarted */ +#define LINUX_ESTRPIPE 86 /* Streams pipe error */ +#define LINUX_EUSERS 87 /* Too many users */ +#define LINUX_ENOTSOCK 88 /* Socket operation on non-socket */ +#define LINUX_EDESTADDRREQ 89 /* Destination address required */ +#define LINUX_EMSGSIZE 90 /* Message too long */ +#define LINUX_EPROTOTYPE 91 /* Protocol wrong type for socket */ +#define LINUX_ENOPROTOOPT 92 /* Protocol not available */ +#define LINUX_EPROTONOSUPPORT 93 /* Protocol not supported */ +#define LINUX_ESOCKTNOSUPPORT 94 /* Socket type not supported */ +#define LINUX_EOPNOTSUPP 95 /* Operation not supported on transport endpoint */ +#define LINUX_EPFNOSUPPORT 96 /* Protocol family not supported */ +#define LINUX_EAFNOSUPPORT 97 /* Address family not supported by protocol */ +#define LINUX_EADDRINUSE 98 /* Address already in use */ +#define LINUX_EADDRNOTAVAIL 99 /* Cannot assign requested address */ +#define LINUX_ENETDOWN 100 /* Network is down */ +#define LINUX_ENETUNREACH 101 /* Network is unreachable */ +#define LINUX_ENETRESET 102 /* Network dropped connection because of reset */ +#define LINUX_ECONNABORTED 103 /* Software caused connection abort */ +#define LINUX_ECONNRESET 104 /* Connection reset by peer */ +#define LINUX_ENOBUFS 105 /* No buffer space available */ +#define LINUX_EISCONN 106 /* Transport endpoint is already connected */ +#define LINUX_ENOTCONN 107 /* Transport endpoint is not connected */ +#define LINUX_ESHUTDOWN 108 /* Cannot send after transport endpoint shutdown */ +#define LINUX_ETOOMANYREFS 109 /* Too many references: cannot splice */ +#define LINUX_ETIMEDOUT 110 /* Connection timed out */ +#define LINUX_ECONNREFUSED 111 /* Connection refused */ +#define LINUX_EHOSTDOWN 112 /* Host is down */ +#define LINUX_EHOSTUNREACH 113 /* No route to host */ +#define LINUX_EALREADY 114 /* Operation already in progress */ +#define LINUX_EINPROGRESS 115 /* Operation now in progress */ +#define LINUX_ESTALE 116 /* Stale NFS file handle */ +#define LINUX_EUCLEAN 117 /* Structure needs cleaning */ +#define LINUX_ENOTNAM 118 /* Not a XENIX named type file */ +#define LINUX_ENAVAIL 119 /* No XENIX semaphores available */ +#define LINUX_EISNAM 120 /* Is a named type file */ +#define LINUX_EREMOTEIO 121 /* Remote I/O error */ +#define LINUX_EDQUOT 122 /* Quota exceeded */ + +#define LINUX_ENOMEDIUM 123 /* No medium found */ +#define LINUX_EMEDIUMTYPE 124 /* Wrong medium type */ +#define LINUX_ECANCELED 125 /* Operation Canceled */ +#define LINUX_ENOKEY 126 /* Required key not available */ +#define LINUX_EKEYEXPIRED 127 /* Key has expired */ +#define LINUX_EKEYREVOKED 128 /* Key has been revoked */ +#define LINUX_EKEYREJECTED 129 /* Key was rejected by service */ + +#define LINUX_EOWNERDEAD 130 /* Owner died */ +#define LINUX_ENOTRECOVERABLE 131 /* State not recoverable */ + +#define LINUX_ERFKILL 132 /* Operation not possible due to RF-kill */ + +#define LINUX_EHWPOISON 133 /* Memory page has hardware error */ + +#endif /* !_LINUX_ERRNO_GENERIC_H */ |
