diff options
| author | Guillem Jover <guillem@hadrons.org> | 2011-09-01 20:24:57 +0200 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2011-09-02 20:18:43 +0200 |
| commit | 729f452a4ff186ae6990c6a3abd1705f42731343 (patch) | |
| tree | cb290458e0ed2715ec39212a6bf002fcd32b68f8 /linux/dev/kernel | |
| parent | 026f55873b827a14db61e6c2c246c454bb3b7b9f (diff) | |
| download | gnumach-729f452a4ff186ae6990c6a3abd1705f42731343.tar.gz gnumach-729f452a4ff186ae6990c6a3abd1705f42731343.tar.bz2 gnumach-729f452a4ff186ae6990c6a3abd1705f42731343.zip | |
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.
Diffstat (limited to 'linux/dev/kernel')
| -rw-r--r-- | linux/dev/kernel/dma.c | 4 | ||||
| -rw-r--r-- | linux/dev/kernel/resource.c | 2 | ||||
| -rw-r--r-- | linux/dev/kernel/sched.c | 4 |
3 files changed, 5 insertions, 5 deletions
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; } |