From 729f452a4ff186ae6990c6a3abd1705f42731343 Mon Sep 17 00:00:00 2001 From: Guillem Jover Date: Thu, 1 Sep 2011 20:24:57 +0200 Subject: 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. --- linux/dev/kernel/sched.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'linux/dev/kernel/sched.c') diff --git a/linux/dev/kernel/sched.c b/linux/dev/kernel/sched.c index 0d2567f..87906a4 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; } -- cgit v1.2.3