Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/compat/linux Cleanup compat linux errnos by adding gener...
details: https://anonhg.NetBSD.org/src/rev/3815955e6f56
branches: trunk
changeset: 325314:3815955e6f56
user: njoly <njoly%NetBSD.org@localhost>
date: Tue Dec 17 22:14:24 2013 +0000
description:
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:
sys/compat/linux/arch/alpha/linux_errno.h | 14 ++-
sys/compat/linux/arch/amd64/linux_errno.h | 96 +-----------------
sys/compat/linux/arch/arm/linux_errno.h | 96 +-----------------
sys/compat/linux/arch/i386/linux_errno.h | 93 +----------------
sys/compat/linux/arch/m68k/linux_errno.h | 96 +-----------------
sys/compat/linux/arch/mips/linux_errno.h | 12 ++-
sys/compat/linux/arch/powerpc/linux_errno.h | 104 +-----------------
sys/compat/linux/common/linux_errno.c | 27 ++--
sys/compat/linux/common/linux_errno.h | 8 +-
sys/compat/linux/common/linux_errno_generic.h | 140 ++++++++++++++++++++++++++
10 files changed, 205 insertions(+), 481 deletions(-)
diffs (truncated from 864 to 300 lines):
diff -r 14432079b8cb -r 3815955e6f56 sys/compat/linux/arch/alpha/linux_errno.h
--- a/sys/compat/linux/arch/alpha/linux_errno.h Tue Dec 17 20:45:22 2013 +0000
+++ b/sys/compat/linux/arch/alpha/linux_errno.h Tue Dec 17 22:14:24 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_errno.h,v 1.7 2008/04/28 20:23:42 martin Exp $ */
+/* $NetBSD: linux_errno.h,v 1.8 2013/12/17 22:14:24 njoly Exp $ */
/*-
* Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -146,5 +146,17 @@
#define LINUX_ENOMEDIUM 129 /* No medium found */
#define LINUX_EMEDIUMTYPE 130 /* Wrong medium type */
+#define LINUX_ECANCELED 131 /* Operation Cancelled */
+#define LINUX_ENOKEY 132 /* Required key not available */
+#define LINUX_EKEYEXPIRED 133 /* Key has expired */
+#define LINUX_EKEYREVOKED 134 /* Key has been revoked */
+#define LINUX_EKEYREJECTED 135 /* Key was rejected by service */
+
+#define LINUX_EOWNERDEAD 136 /* Owner died */
+#define LINUX_ENOTRECOVERABLE 137 /* State not recoverable */
+
+#define LINUX_ERFKILL 138 /* Operation not possible due to RF-kill */
+
+#define LINUX_EHWPOISON 139 /* Memory page has hardware error */
#endif /* !_ALPHA_LINUX_ERRNO_H */
diff -r 14432079b8cb -r 3815955e6f56 sys/compat/linux/arch/amd64/linux_errno.h
--- a/sys/compat/linux/arch/amd64/linux_errno.h Tue Dec 17 20:45:22 2013 +0000
+++ b/sys/compat/linux/arch/amd64/linux_errno.h Tue Dec 17 22:14:24 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_errno.h,v 1.2 2005/12/11 12:20:14 christos Exp $ */
+/* $NetBSD: linux_errno.h,v 1.3 2013/12/17 22:14:24 njoly Exp $ */
/*-
* Copyright (c) 2005 Emmanuel Dreyfus, all rights reserved.
@@ -34,102 +34,12 @@
#ifndef _AMD64_LINUX_ERRNO_H
#define _AMD64_LINUX_ERRNO_H
+#include <compat/linux/common/linux_errno_generic.h>
+
/*
* Linux/amd64 returns nagative errors to userland
*/
#define LINUX_SCERR_SIGN -
-/*
- * errno 1 to 35 are in <compat/linux/common/linux_errno.h>
- */
-#define LINUX_ENAMETOOLONG 36
-#define LINUX_ENOLCK 37
-#define LINUX_ENOSYS 38
-#define LINUX_ENOTEMPTY 39
-#define LINUX_ELOOP 40
-#define LINUX_ENOMSG 42
-#define LINUX_EIDRM 43
-#define LINUX_ECHRNG 44
-#define LINUX_EL2NSYNC 45
-#define LINUX_EL3HLT 46
-#define LINUX_EL3RST 47
-#define LINUX_ELNRNG 48
-#define LINUX_EUNATCH 49
-#define LINUX_ENOCSI 50
-#define LINUX_EL2HLT 51
-#define LINUX_EBADE 52
-#define LINUX_EBADR 53
-#define LINUX_EXFULL 54
-#define LINUX_ENOANO 55
-#define LINUX_EBADRQC 56
-#define LINUX_EBADSLT 57
-#define LINUX_EDEADLOCK 58
-#define LINUX_EBFONT 59
-#define LINUX_ENOSTR 60
-#define LINUX_ENODATA 61
-#define LINUX_ETIME 62
-#define LINUX_ENOSR 63
-#define LINUX_ENONET 64
-#define LINUX_ENOPKG 65
-#define LINUX_EREMOTE 66
-#define LINUX_ENOLINK 67
-#define LINUX_EADV 68
-#define LINUX_ESRMNT 69
-#define LINUX_ECOMM 70
-#define LINUX_EPROTO 71
-#define LINUX_EMULTIHOP 72
-#define LINUX_EDOTDOT 73
-#define LINUX_EBADMSG 74
-#define LINUX_EOVERFLOW 75
-#define LINUX_ENOTUNIQ 76
-#define LINUX_EBADFD 77
-#define LINUX_EREMCHG 78
-#define LINUX_ELIBACC 79
-#define LINUX_ELIBBAD 80
-#define LINUX_ELIBSCN 81
-#define LINUX_ELIBMAX 82
-#define LINUX_ELIBEXEC 83
-#define LINUX_EILSEQ 84
-#define LINUX_ERESTART 85
-#define LINUX_ESTRPIPE 86
-#define LINUX_EUSERS 87
-#define LINUX_ENOTSOCK 88
-#define LINUX_EDESTADDRREQ 89
-#define LINUX_EMSGSIZE 90
-#define LINUX_EPROTOTYPE 91
-#define LINUX_ENOPROTOOPT 92
-#define LINUX_EPROTONOSUPPORT 93
-#define LINUX_ESOCKTNOSUPPORT 94
-#define LINUX_EOPNOTSUPP 95
-#define LINUX_EPFNOSUPPORT 96
-#define LINUX_EAFNOSUPPORT 97
-#define LINUX_EADDRINUSE 98
-#define LINUX_EADDRNOTAVAIL 99
-#define LINUX_ENETDOWN 100
-#define LINUX_ENETUNREACH 101
-#define LINUX_ENETRESET 102
-#define LINUX_ECONNABORTED 103
-#define LINUX_ECONNRESET 104
-#define LINUX_ENOBUFS 105
-#define LINUX_EISCONN 106
-#define LINUX_ENOTCONN 107
-#define LINUX_ESHUTDOWN 108
-#define LINUX_ETOOMANYREFS 109
-#define LINUX_ETIMEDOUT 110
-#define LINUX_ECONNREFUSED 111
-#define LINUX_EHOSTDOWN 112
-#define LINUX_EHOSTUNREACH 113
-#define LINUX_EALREADY 114
-#define LINUX_EINPROGRESS 115
-#define LINUX_ESTALE 116
-#define LINUX_EUCLEAN 117
-#define LINUX_ENOTNAM 118
-#define LINUX_ENAVAIL 119
-#define LINUX_EISNAM 120
-#define LINUX_EREMOTEIO 121
-#define LINUX_EDQUOT 122
-#define LINUX_ENOMEDIUM 123
-#define LINUX_EMEDIUMTYPE 124
-
#endif /* !_AMD64_LINUX_ERRNO_H */
diff -r 14432079b8cb -r 3815955e6f56 sys/compat/linux/arch/arm/linux_errno.h
--- a/sys/compat/linux/arch/arm/linux_errno.h Tue Dec 17 20:45:22 2013 +0000
+++ b/sys/compat/linux/arch/arm/linux_errno.h Tue Dec 17 22:14:24 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_errno.h,v 1.6 2008/04/28 20:23:42 martin Exp $ */
+/* $NetBSD: linux_errno.h,v 1.7 2013/12/17 22:14:24 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -32,102 +32,12 @@
#ifndef _ARM_LINUX_ERRNO_H
#define _ARM_LINUX_ERRNO_H
+#include <compat/linux/common/linux_errno_generic.h>
+
/*
* Linux/arm returns negative errors to userland
* The libc makes the errno positive.
*/
#define LINUX_SCERR_SIGN -
-/* Use common/linux_errno.h for #1-35 */
-
-
-#define LINUX_ENAMETOOLONG 36
-#define LINUX_ENOLCK 37
-#define LINUX_ENOSYS 38
-#define LINUX_ENOTEMPTY 39
-#define LINUX_ELOOP 40
-#define LINUX_ENOMSG 42
-#define LINUX_EIDRM 43
-#define LINUX_ECHRNG 44
-#define LINUX_EL2NSYNC 45
-#define LINUX_EL3HLT 46
-#define LINUX_EL3RST 47
-#define LINUX_ELNRNG 48
-#define LINUX_EUNATCH 49
-#define LINUX_ENOCSI 50
-#define LINUX_EL2HLT 51
-#define LINUX_EBADE 52
-#define LINUX_EBADR 53
-#define LINUX_EXFULL 54
-#define LINUX_ENOANO 55
-#define LINUX_EBADRQC 56
-#define LINUX_EBADSLT 57
-#define LINUX_EDEADLOCK 58
-#define LINUX_EBFONT 59
-#define LINUX_ENOSTR 60
-#define LINUX_ENODATA 61
-#define LINUX_ETIME 62
-#define LINUX_ENOSR 63
-#define LINUX_ENONET 64
-#define LINUX_ENOPKG 65
-#define LINUX_EREMOTE 66
-#define LINUX_ENOLINK 67
-#define LINUX_EADV 68
-#define LINUX_ESRMNT 69
-#define LINUX_ECOMM 70
-#define LINUX_EPROTO 71
-#define LINUX_EMULTIHOP 72
-#define LINUX_EDOTDOT 73
-#define LINUX_EBADMSG 74
-#define LINUX_EOVERFLOW 75
-#define LINUX_ENOTUNIQ 76
-#define LINUX_EBADFD 77
-#define LINUX_EREMCHG 78
-#define LINUX_ELIBACC 79
-#define LINUX_ELIBBAD 80
-#define LINUX_ELIBSCN 81
-#define LINUX_ELIBMAX 82
-#define LINUX_ELIBEXEC 83
-#define LINUX_EILSEQ 84
-#define LINUX_ERESTART 85
-#define LINUX_ESTRPIPE 86
-#define LINUX_EUSERS 87
-#define LINUX_ENOTSOCK 88
-#define LINUX_EDESTADDRREQ 89
-#define LINUX_EMSGSIZE 90
-#define LINUX_EPROTOTYPE 91
-#define LINUX_ENOPROTOOPT 92
-#define LINUX_EPROTONOSUPPORT 93
-#define LINUX_ESOCKTNOSUPPORT 94
-#define LINUX_EOPNOTSUPP 95
-#define LINUX_EPFNOSUPPORT 96
-#define LINUX_EAFNOSUPPORT 97
-#define LINUX_EADDRINUSE 98
-#define LINUX_EADDRNOTAVAIL 99
-#define LINUX_ENETDOWN 100
-#define LINUX_ENETUNREACH 101
-#define LINUX_ENETRESET 102
-#define LINUX_ECONNABORTED 103
-#define LINUX_ECONNRESET 104
-#define LINUX_ENOBUFS 105
-#define LINUX_EISCONN 106
-#define LINUX_ENOTCONN 107
-#define LINUX_ESHUTDOWN 108
-#define LINUX_ETOOMANYREFS 109
-#define LINUX_ETIMEDOUT 110
-#define LINUX_ECONNREFUSED 111
-#define LINUX_EHOSTDOWN 112
-#define LINUX_EHOSTUNREACH 113
-#define LINUX_EALREADY 114
-#define LINUX_EINPROGRESS 115
-#define LINUX_ESTALE 116
-#define LINUX_EUCLEAN 117
-#define LINUX_ENOTNAM 118
-#define LINUX_ENAVAIL 119
-#define LINUX_EISNAM 120
-#define LINUX_EREMOTEIO 121
-#define LINUX_EDQUOT 122
-#define LINUX_ENOMEDIUM 123
-#define LINUX_EMEDIUMTYPE 124
-
#endif
diff -r 14432079b8cb -r 3815955e6f56 sys/compat/linux/arch/i386/linux_errno.h
--- a/sys/compat/linux/arch/i386/linux_errno.h Tue Dec 17 20:45:22 2013 +0000
+++ b/sys/compat/linux/arch/i386/linux_errno.h Tue Dec 17 22:14:24 2013 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: linux_errno.h,v 1.10 2008/04/28 20:23:42 martin Exp $ */
+/* $NetBSD: linux_errno.h,v 1.11 2013/12/17 22:14:24 njoly Exp $ */
/*-
* Copyright (c) 1995, 1998 The NetBSD Foundation, Inc.
@@ -32,99 +32,12 @@
#ifndef _I386_LINUX_ERRNO_H
#define _I386_LINUX_ERRNO_H
+#include <compat/linux/common/linux_errno_generic.h>
+
/*
* Linux/i386 returns negative errors to userland
* The libc makes the errno positive.
*/
#define LINUX_SCERR_SIGN -
-/* Use common/linux_errno.h for #1-35 */
-
-#define LINUX_ENAMETOOLONG 36
-#define LINUX_ENOLCK 37
-#define LINUX_ENOSYS 38
-#define LINUX_ENOTEMPTY 39
-#define LINUX_ELOOP 40
-#define LINUX_ENOMSG 42
-#define LINUX_EIDRM 43
-#define LINUX_ECHRNG 44
-#define LINUX_EL2NSYNC 45
-#define LINUX_EL3HLT 46
-#define LINUX_EL3RST 47
-#define LINUX_ELNRNG 48
-#define LINUX_EUNATCH 49
-#define LINUX_ENOCSI 50
-#define LINUX_EL2HLT 51
-#define LINUX_EBADE 52
-#define LINUX_EBADR 53
-#define LINUX_EXFULL 54
-#define LINUX_ENOANO 55
-#define LINUX_EBADRQC 56
-#define LINUX_EBADSLT 57
-#define LINUX_EDEADLOCK 58
Home |
Main Index |
Thread Index |
Old Index