Do not remap errno codes from E* to LINUX_E*

Mach no longer uses any of the old and clashing errno E* codes, so
it's safe to use them now w/o namespacing. This also means one less
modification needed to the Linux code.

* linux/dev/include/asm-i386/errno.h: Remove file.
* linux/dev/kernel/dma.c (notifier_chain_unregister) [MACH_INCLUDE]: Remove
code.
* linux/dev/include/linux/notifier.h: Likewise.
* linux/dev/arch/i386/kernel/irq.c (setup_x86_irq): Rename LINUX_EBUSY
to EBUSY.
(request_irq): Rename LINUX_EINVAL to EINVAL.
* linux/dev/glue/block.c (register_blkdev): Rename LINUX_EBUSY to EBUSY
and LINUX_EINVAL to EINVAL.
(unregister_blkdev): Rename LINUX_EINVAL to EINVAL.
(rdwr_partial) Rename LINUX_ENOMEM to ENOMEM and LINUX_EIO to EIO.
* linux/dev/glue/misc.c (linux_to_mach_error): Rename LINUX_EPERM to
EPERM, LINUX_EIO to EIO, LINUX_ENXIO to ENXIO, LINUX_EACCES to EACCES,
LINUX_EFAULT to EFAULT, LINUX_EBUSY to EBUSY, LINUX_EINVAL to EINVAL,
LINUX_EROFS to EROFS, LINUX_EWOULDBLOCK to EWOULDBLOCK and LINUX_ENOMEM
to ENOMEM.
(verify_area): Rename LINUX_EFAULT to EFAULT.
* linux/dev/kernel/resource.c (check_region): Rename LINUX_EBUSY to
EBUSY.
* linux/dev/kernel/sched.c (__do_down): Rename LINUX_EINTR to EINTR.

8 files changed, 31 insertions, 301 deletions

diff --git a/linux/dev/arch/i386/kernel/irq.c b/linux/dev/arch/i386/kernel/irq.c
index d996c25c..41bdaa3c 100644
--- a/linux/dev/arch/i386/kernel/irq.c
+++ b/linux/dev/arch/i386/kernel/irq.c
@@ -215,15 +215,15 @@ setup_x86_irq (int irq, struct linux_action *new)
     {
       /* Can't share interrupts unless both agree to */
       if (!(old->flags & new->flags & SA_SHIRQ))
-	return (-LINUX_EBUSY);
+	return (-EBUSY);
 
       /* Can't share interrupts unless both are same type */
       if ((old->flags ^ new->flags) & SA_INTERRUPT)
-	return (-LINUX_EBUSY);
+	return (-EBUSY);
 
       /* Can't share at different levels */
       if (intpri[irq] && linux_intr_pri != intpri[irq])
-	return (-LINUX_EBUSY);
+	return (-EBUSY);
 
       /* add new interrupt at end of irq queue */
       do
@@ -263,7 +263,7 @@ request_irq (unsigned int irq, void (*handler) (int, void *, struct pt_regs *),
   assert (irq < 16);
 
   if (!handler)
-    return -LINUX_EINVAL;
+    return -EINVAL;
   
   /*
    * Hmm... Should I use `kalloc()' ?
@@ -272,7 +272,7 @@ request_irq (unsigned int irq, void (*handler) (int, void *, struct pt_regs *),
   action = (struct linux_action *)
     linux_kmalloc (sizeof (struct linux_action), GFP_KERNEL);
   if (action == NULL)
-    return -LINUX_ENOMEM;
+    return -ENOMEM;
   
   action->handler = handler;
   action->next = NULL;
diff --git a/linux/dev/glue/block.c b/linux/dev/glue/block.c
index c9956383..dfd2ee98 100644
--- a/linux/dev/glue/block.c
+++ b/linux/dev/glue/block.c
@@ -231,12 +231,12 @@ register_blkdev (unsigned major, const char *name,
       for (major = MAX_BLKDEV - 1; major > 0; major--)
 	if (blkdevs[major].fops == NULL)
 	  goto out;
-      return -LINUX_EBUSY;
+      return -EBUSY;
     }
   if (major >= MAX_BLKDEV)
-    return -LINUX_EINVAL;
+    return -EINVAL;
   if (blkdevs[major].fops && blkdevs[major].fops != fops)
-    return -LINUX_EBUSY;
+    return -EBUSY;
 
 out:
   blkdevs[major].name = name;
@@ -255,9 +255,9 @@ int
 unregister_blkdev (unsigned major, const char *name)
 {
   if (major >= MAX_BLKDEV)
-    return -LINUX_EINVAL;
+    return -EINVAL;
   if (! blkdevs[major].fops || strcmp (blkdevs[major].name, name))
-    return -LINUX_EINVAL;
+    return -EINVAL;
   blkdevs[major].fops = NULL;
   if (blkdevs[major].labels)
     {
@@ -525,7 +525,7 @@ rdwr_partial (int rw, kdev_t dev, loff_t *off,
     }
   bh->b_data = alloc_buffer (bh->b_size);
   if (! bh->b_data)
-    return -LINUX_ENOMEM;
+    return -ENOMEM;
   ll_rw_block (READ, 1, &bh);
   wait_on_buffer (bh);
   if (buffer_uptodate (bh))
@@ -544,7 +544,7 @@ rdwr_partial (int rw, kdev_t dev, loff_t *off,
 	  wait_on_buffer (bh);
 	  if (! buffer_uptodate (bh))
 	    {
-	      err = -LINUX_EIO;
+	      err = -EIO;
 	      goto out;
 	    }
 	}
@@ -553,7 +553,7 @@ rdwr_partial (int rw, kdev_t dev, loff_t *off,
       *off += c;
     }
   else
-    err = -LINUX_EIO;
+    err = -EIO;
 out:
   free_buffer (bh->b_data, bh->b_size);
   return err;
@@ -606,7 +606,7 @@ rdwr_full (int rw, kdev_t dev, loff_t *off, char **buf, int *resid, int bshift)
 	  bh->b_data = alloc_buffer (cc);
 	  if (! bh->b_data)
 	    {
-	      err = -LINUX_ENOMEM;
+	      err = -ENOMEM;
 	      break;
 	    }
 	  if (rw == WRITE)
@@ -630,7 +630,7 @@ rdwr_full (int rw, kdev_t dev, loff_t *off, char **buf, int *resid, int bshift)
 	  && rw == READ && test_bit (BH_Bounce, &bh->b_state))
 	memcpy (*buf + cc, bh->b_data, bh->b_size);
       else if (! err && ! buffer_uptodate (bh))
-	  err = -LINUX_EIO;
+	  err = -EIO;
       if (test_bit (BH_Bounce, &bh->b_state))
 	free_buffer (bh->b_data, bh->b_size);
     }
diff --git a/linux/dev/glue/misc.c b/linux/dev/glue/misc.c
index 98c8248f..f25d501b 100644
--- a/linux/dev/glue/misc.c
+++ b/linux/dev/glue/misc.c
@@ -82,34 +82,34 @@ linux_to_mach_error (int err)
     case 0:
       return D_SUCCESS;
 
-    case -LINUX_EPERM:
+    case -EPERM:
       return D_INVALID_OPERATION;
 
-    case -LINUX_EIO:
+    case -EIO:
       return D_IO_ERROR;
 
-    case -LINUX_ENXIO:
+    case -ENXIO:
       return D_NO_SUCH_DEVICE;
 
-    case -LINUX_EACCES:
+    case -EACCES:
       return D_INVALID_OPERATION;
 
-    case -LINUX_EFAULT:
+    case -EFAULT:
       return D_INVALID_SIZE;
 
-    case -LINUX_EBUSY:
+    case -EBUSY:
       return D_ALREADY_OPEN;
 
-    case -LINUX_EINVAL:
+    case -EINVAL:
       return D_INVALID_SIZE;
 
-    case -LINUX_EROFS:
+    case -EROFS:
       return D_READ_ONLY;
 
-    case -LINUX_EWOULDBLOCK:
+    case -EWOULDBLOCK:
       return D_WOULD_BLOCK;
 
-    case -LINUX_ENOMEM:
+    case -ENOMEM:
       return D_NO_MEMORY;
 
     default:
@@ -146,7 +146,7 @@ verify_area (int rw, const void *p, unsigned long size)
 	  || (entry->protection & prot) != prot)
 	{
 	  vm_map_unlock_read (current_map ());
-	  return -LINUX_EFAULT;
+	  return -EFAULT;
 	}
       if (entry->vme_end - entry->vme_start >= len)
 	break;
diff --git a/linux/dev/include/asm-i386/errno.h b/linux/dev/include/asm-i386/errno.h
deleted file mode 100644
index 1683367a..00000000
--- a/linux/dev/include/asm-i386/errno.h
+++ /dev/null
@@ -1,266 +0,0 @@
-#ifndef _I386_ERRNO_H
-#define _I386_ERRNO_H
-
-#ifdef MACH_INCLUDE
-
-#define	LINUX_EPERM		 1	/* Operation not permitted */
-#define	LINUX_ENOENT		 2	/* No such file or directory */
-#define	LINUX_ESRCH		 3	/* No such process */
-#define	LINUX_EINTR		 4	/* Interrupted system call */
-#define	LINUX_EIO		 5	/* I/O error */
-#define	LINUX_ENXIO		 6	/* No such device or address */
-#define	LINUX_E2BIG		 7	/* Arg list too long */
-#define	LINUX_ENOEXEC		 8	/* Exec format error */
-#define	LINUX_EBADF		 9	/* Bad file number */
-#define	LINUX_ECHILD		10	/* No child processes */
-#define	LINUX_EAGAIN		11	/* Try again */
-#define	LINUX_ENOMEM		12	/* Out of memory */
-#define	LINUX_EACCES		13	/* Permission denied */
-#define	LINUX_EFAULT		14	/* Bad address */
-#define	LINUX_ENOTBLK		15	/* Block device required */
-#define	LINUX_EBUSY		16	/* Device or resource busy */
-#define	LINUX_EEXIST		17	/* File exists */
-#define	LINUX_EXDEV		18	/* Cross-device link */
-#define	LINUX_ENODEV		19	/* No such device */
-#define	LINUX_ENOTDIR		20	/* Not a directory */
-#define	LINUX_EISDIR		21	/* Is a directory */
-#define	LINUX_EINVAL		22	/* Invalid argument */
-#define	LINUX_ENFILE		23	/* File table overflow */
-#define	LINUX_EMFILE		24	/* Too many open files */
-#define	LINUX_ENOTTY		25	/* Not a typewriter */
-#define	LINUX_ETXTBSY		26	/* Text file busy */
-#define	LINUX_EFBIG		27	/* File too large */
-#define	LINUX_ENOSPC		28	/* No space left on device */
-#define	LINUX_ESPIPE		29	/* Illegal seek */
-#define	LINUX_EROFS		30	/* Read-only file system */
-#define	LINUX_EMLINK		31	/* Too many links */
-#define	LINUX_EPIPE		32	/* Broken pipe */
-#define	LINUX_EDOM		33	/* Math argument out of domain of func */
-#define	LINUX_ERANGE		34	/* Math result not representable */
-#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 */
-
-#else /* !MACH_INCLUDE */
-
-#define	EPERM		 1	/* Operation not permitted */
-#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 /* !MACH_INCLUDE */
-
-#endif
diff --git a/linux/dev/include/linux/notifier.h b/linux/dev/include/linux/notifier.h
index eede20f0..b3c9ccf6 100644
--- a/linux/dev/include/linux/notifier.h
+++ b/linux/dev/include/linux/notifier.h
@@ -55,11 +55,7 @@ extern __inline__ int notifier_chain_unregister(struct notifier_block **nl, stru
 		}
 		nl=&((*nl)->next);
 	}
-#ifdef MACH_INCLUDE
-    return -LINUX_ENOENT;
-#else
 	return -ENOENT;
-#endif
 }
 
 /*
diff --git a/linux/dev/kernel/dma.c b/linux/dev/kernel/dma.c
index 4b569780..bbda4bbf 100644
--- a/linux/dev/kernel/dma.c
+++ b/linux/dev/kernel/dma.c
@@ -80,10 +80,10 @@ int
 request_dma (unsigned int dmanr, const char *device_id)
 {
   if (dmanr >= MAX_DMA_CHANNELS)
-    return -LINUX_EINVAL;
+    return -EINVAL;
   
   if (xchg (&dma_chan_busy[dmanr].lock, 1) != 0)
-    return -LINUX_EBUSY;
+    return -EBUSY;
   
   dma_chan_busy[dmanr].device_id = device_id;
   
diff --git a/linux/dev/kernel/resource.c b/linux/dev/kernel/resource.c
index 7a187552..ba107e8e 100644
--- a/linux/dev/kernel/resource.c
+++ b/linux/dev/kernel/resource.c
@@ -131,7 +131,7 @@ release_region (unsigned int from, unsigned int num)
 int
 check_region (unsigned int from, unsigned int num)
 {
-  return (find_gap (&iolist, from, num) == NULL) ? -LINUX_EBUSY : 0;
+  return (find_gap (&iolist, from, num) == NULL) ? -EBUSY : 0;
 }
 
 /* Called from init/main.c to reserve IO ports. */
diff --git a/linux/dev/kernel/sched.c b/linux/dev/kernel/sched.c
index 0d2567f3..87906a45 100644
--- a/linux/dev/kernel/sched.c
+++ b/linux/dev/kernel/sched.c
@@ -160,7 +160,7 @@ __do_down (struct semaphore *sem, int task_state)
 
 	  if (task_state == TASK_INTERRUPTIBLE && issig ())
 	    {
-	      ret = -LINUX_EINTR;
+	      ret = -EINTR;
 	      atomic_inc (&sem->count);
 	      break;
 	    }
@@ -180,7 +180,7 @@ __do_down (struct semaphore *sem, int task_state)
     {
       if (task_state == TASK_INTERRUPTIBLE && issig ())
 	{
-	  ret = -LINUX_EINTR;
+	  ret = -EINTR;
 	  atomic_inc (&sem->count);
 	  break;
 	}