diff options
34 files changed, 72 insertions, 741 deletions
diff --git a/Makefrag.am b/Makefrag.am index 5e26aa7a..fbe09068 100644 --- a/Makefrag.am +++ b/Makefrag.am @@ -128,7 +128,6 @@ libkernel_a_SOURCES += \ kern/ast.h \ kern/boot_script.h \ kern/bootstrap.c \ - kern/compat_xxx_defs.h \ kern/counters.c \ kern/counters.h \ kern/cpu_number.h \ @@ -280,7 +279,6 @@ libkernel_a_SOURCES += \ device/device_types_kernel.h \ device/ds_routines.c \ device/ds_routines.h \ - device/errno.h \ device/if_ether.h \ device/if_hdr.h \ device/io_req.h \ diff --git a/device/device.srv b/device/device.srv index 06aa0be3..f63813f9 100644 --- a/device/device.srv +++ b/device/device.srv @@ -24,6 +24,4 @@ #define KERNEL_SERVER 1 -simport <kern/compat_xxx_defs.h>; /* for obsolete routines */ - #include <device/device.defs> diff --git a/device/errno.h b/device/errno.h deleted file mode 100644 index e65aa984..00000000 --- a/device/errno.h +++ /dev/null @@ -1,45 +0,0 @@ -/* - * Mach Operating System - * Copyright (c) 1991 Carnegie Mellon University - * All Rights Reserved. - * - * Permission to use, copy, modify and distribute this software and its - * documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" - * CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR - * ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie Mellon - * the rights to redistribute these changes. - */ -/* - * Author: David B. Golub, Carnegie Mellon University - * Date: 8/89 - * - * Old names for new error codes, for compatibility. - */ - -#ifndef _ERRNO_ -#define _ERRNO_ - -#include <device/device_types.h> /* the real error names */ - -#define EIO D_IO_ERROR -#define ENXIO D_NO_SUCH_DEVICE -#define EINVAL D_INVALID_SIZE /* XXX */ -#define EBUSY D_ALREADY_OPEN -#define ENOTTY D_INVALID_OPERATION -#define ENOMEM D_NO_MEMORY - -#endif /* _ERRNO_ */ diff --git a/i386/i386at/com.c b/i386/i386at/com.c index b1406f08..9ffe8747 100644 --- a/i386/i386at/com.c +++ b/i386/i386at/com.c @@ -35,7 +35,7 @@ #include <kern/mach_clock.h> #include <sys/time.h> #include <device/conf.h> -#include <device/errno.h> +#include <device/device_types.h> #include <device/tty.h> #include <device/io_req.h> @@ -335,13 +335,13 @@ io_return_t comopen( io_return_t result; if (unit >= NCOM) - return ENXIO; /* no such device */ + return D_NO_SUCH_DEVICE; /* no such device */ if ((isai = cominfo[unit]) == 0 || isai->alive == 0) { /* * Try to probe it again */ if (!com_reprobe(unit)) - return ENXIO; + return D_NO_SUCH_DEVICE; } tp = &com_tty[unit]; diff --git a/i386/i386at/kd_event.c b/i386/i386at/kd_event.c index 3983a118..8ea313bf 100644 --- a/i386/i386at/kd_event.c +++ b/i386/i386at/kd_event.c @@ -61,7 +61,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #ifdef MACH_KERNEL #include <device/ds_routines.h> -#include <device/errno.h> +#include <device/device_types.h> #include <device/io_req.h> #else /* MACH_KERNEL */ #include <sys/file.h> diff --git a/i386/i386at/kd_mouse.c b/i386/i386at/kd_mouse.c index 640209c5..770a3fe3 100644 --- a/i386/i386at/kd_mouse.c +++ b/i386/i386at/kd_mouse.c @@ -69,7 +69,7 @@ WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include <kern/printf.h> #ifdef MACH_KERNEL #include <device/ds_routines.h> -#include <device/errno.h> +#include <device/device_types.h> #include <device/io_req.h> #include <device/subrs.h> #else /* MACH_KERNEL */ @@ -179,10 +179,10 @@ mouseopen(dev, flags) #ifdef MACH_KERNEL #else /* MACH_KERNEL */ if (flags & FWRITE) - return(ENODEV); + return (D_NO_SUCH_DEVICE); #endif /* MACH_KERNEL */ if (mouse_in_use) - return(EBUSY); + return (D_ALREADY_OPEN); mouse_in_use = TRUE; /* locking? */ kdq_reset(&mouse_queue); lastbuttons = MOUSE_ALL_UP; diff --git a/i386/i386at/lpr.c b/i386/i386at/lpr.c index 8d077d57..cf76da23 100644 --- a/i386/i386at/lpr.c +++ b/i386/i386at/lpr.c @@ -37,7 +37,7 @@ #include <kern/mach_clock.h> #include <sys/time.h> #include <device/conf.h> -#include <device/errno.h> +#include <device/device_types.h> #include <device/tty.h> #include <device/io_req.h> #else /* MACH_KERNEL */ @@ -140,11 +140,11 @@ struct tty *tp; u_short addr; if (unit >= NLPR || (isai = lprinfo[unit]) == 0 || isai->alive == 0) - return(ENXIO); + return (D_NO_SUCH_DEVICE); tp = &lpr_tty[unit]; #ifndef MACH_KERNEL if (tp->t_state & TS_XCLUDE && u.u_uid != 0) - return(EBUSY); + return (D_ALREADY_OPEN); #endif /* MACH_KERNEL */ addr = (u_short) isai->address; tp->t_dev = dev; diff --git a/include/device/device.defs b/include/device/device.defs index 2bbd5563..d9234e39 100644 --- a/include/device/device.defs +++ b/include/device/device.defs @@ -32,10 +32,6 @@ * block and character device interfaces to the kernel. */ -#ifdef MACH_KERNEL -simport <kern/compat_xxx_defs.h>; /* for obsolete routines */ -#endif - subsystem #if KERNEL_SERVER KernelServer @@ -99,27 +95,9 @@ routine device_read_inband( out data : io_buf_ptr_inband_t ); -/* obsolete */ -routine xxx_device_set_status( - device : device_t; - in flavor : dev_flavor_t; - in status : dev_status_t, IsLong - ); - -/* obsolete */ -routine xxx_device_get_status( - device : device_t; - in flavor : dev_flavor_t; - out status : dev_status_t, IsLong - ); - -/* obsolete */ -routine xxx_device_set_filter( - device : device_t; - in receive_port : mach_port_send_t; - in priority : int; - in filter : filter_array_t, IsLong - ); +skip; /* old xxx_device_set_status */ +skip; /* old xxx_device_get_status */ +skip; /* old xxx_device_set_filter*/ routine device_map( device : device_t; diff --git a/include/mach/mach.defs b/include/mach/mach.defs index 4531a220..58510805 100644 --- a/include/mach/mach.defs +++ b/include/mach/mach.defs @@ -30,10 +30,6 @@ * Matchmaker definitions file for Mach kernel interface. */ -#ifdef MACH_KERNEL -simport <kern/compat_xxx_defs.h>; /* for obsolete routines */ -#endif /* MACH_KERNEL */ - subsystem #if KERNEL_USER KernelUser @@ -388,16 +384,8 @@ skip; /* old pager_flush_request */ * boolean). The new routine is backwards compatible at the C * language interface. */ -simpleroutine xxx_memory_object_lock_request( - memory_control : memory_object_control_t; - offset : vm_offset_t; - size : vm_size_t; - should_clean : boolean_t; - should_flush : boolean_t; - lock_value : vm_prot_t; - reply_to : mach_port_t = - MACH_MSG_TYPE_MAKE_SEND_ONCE|polymorphic); +skip; /* old xxx_memory_object_lock_request */ simpleroutine memory_object_lock_request( memory_control : memory_object_control_t; @@ -409,46 +397,11 @@ simpleroutine memory_object_lock_request( reply_to : mach_port_t = MACH_MSG_TYPE_MAKE_SEND_ONCE|polymorphic); -/* obsolete */ -routine xxx_task_get_emulation_vector( - task : task_t; - out vector_start : int; - out emulation_vector: xxx_emulation_vector_t, IsLong); - -/* obsolete */ -routine xxx_task_set_emulation_vector( - task : task_t; - vector_start : int; - emulation_vector: xxx_emulation_vector_t, IsLong); - -/* - * Returns information about the host on which the - * target object resides. [This object may be - * a task, thread, or memory_object_control port.] - */ -routine xxx_host_info( - target_task : mach_port_t; - out info : machine_info_data_t); - -/* - * Returns information about a particular processor on - * the host on which the target task resides. - */ -routine xxx_slot_info( - target_task : task_t; - slot : int; - out info : machine_slot_data_t); - -/* - * Performs control operations (currently only - * turning off or on) on a particular processor on - * the host on which the target task resides. - */ -routine xxx_cpu_control( - target_task : task_t; - cpu : int; - running : boolean_t); - +skip; /* old xxx_task_get_emulation_vector */ +skip; /* old xxx_task_set_emulation_vector */ +skip; /* old xxx_host_info */ +skip; /* old xxx_slot_info */ +skip; /* old xxx_cpu_control */ skip; /* old thread_statistics */ skip; /* old task_statistics */ skip; /* old netport_init */ @@ -491,11 +444,7 @@ routine task_set_special_port( which_port : int; special_port : mach_port_t); -/* obsolete */ -routine xxx_task_info( - target_task : task_t; - flavor : int; - out task_info_out : task_info_t, IsLong); +skip; /* old xxx_task_info */ /* @@ -537,17 +486,8 @@ routine thread_resume( routine thread_abort( target_thread : thread_t); -/* obsolete */ -routine xxx_thread_get_state( - target_thread : thread_t; - flavor : int; - out old_state : thread_state_t, IsLong); - -/* obsolete */ -routine xxx_thread_set_state( - target_thread : thread_t; - flavor : int; - new_state : thread_state_t, IsLong); +skip; /* old xxx_thread_get_state */ +skip; /* old xxx_thread_set_state */ /* * Returns the current value of the selected special port @@ -567,11 +507,7 @@ routine thread_set_special_port( which_port : int; special_port : mach_port_t); -/* obsolete */ -routine xxx_thread_info( - target_thread : thread_t; - flavor : int; - out thread_info_out : thread_info_t, IsLong); +skip; /* old xxx_thread_info */ /* * Establish a user-level handler for the specified diff --git a/include/mach/mach_host.defs b/include/mach/mach_host.defs index 85ee4dc5..2644146f 100644 --- a/include/mach/mach_host.defs +++ b/include/mach/mach_host.defs @@ -34,10 +34,6 @@ * control. */ -#ifdef MACH_KERNEL -simport <kern/compat_xxx_defs.h>; /* for obsolete routines */ -#endif - subsystem #if KERNEL_SERVER KernelServer @@ -59,19 +55,8 @@ routine host_processors( host_priv : host_priv_t; out processor_list : processor_array_t); -/* obsolete */ -routine yyy_host_info( - host : host_t; - flavor : int; - out host_info_out : host_info_t, IsLong); - - -/* obsolete */ -routine yyy_processor_info( - processor : processor_t; - flavor : int; - out host : host_t; - out processor_info_out: processor_info_t, IsLong); +skip; /* old yyy_host_info */ +skip; /* old yyy_processor_info */ /* * Start processor. @@ -87,10 +72,7 @@ routine processor_start( routine processor_exit( processor : processor_t); -/* obsolete */ -routine yyy_processor_control( - processor : processor_t; - processor_cmd : processor_info_t, IsLong); +skip; /* old yyy_processor_control */ /* * Get default processor set for host. @@ -99,13 +81,7 @@ routine processor_set_default( host : host_t; out default_set : processor_set_name_t); -/* - * Get rights to default processor set for host. - * Replaced by host_processor_set_priv. - */ -routine xxx_processor_set_default_priv( - host : host_priv_t; - out default_set : processor_set_t); +skip; /* old xxx_processor_set_default_priv */ /* * Create new processor set. Returns real port for manipulations, @@ -122,12 +98,7 @@ routine processor_set_create( routine processor_set_destroy( set : processor_set_t); -/* obsolete */ -routine yyy_processor_set_info( - set_name : processor_set_name_t; - flavor : int; - out host : host_t; - out info_out : processor_set_info_t, IsLong); +skip; /* old yyy_processor_set_info */ /* * Assign processor to processor set. diff --git a/include/mach/mach_types.defs b/include/mach/mach_types.defs index 5e31cdcf..607d5d92 100644 --- a/include/mach/mach_types.defs +++ b/include/mach/mach_types.defs @@ -228,10 +228,6 @@ type time_value_t = struct[2] of integer_t; type emulation_vector_t = ^array[] of vm_offset_t; -type xxx_emulation_vector_t = array[*:1024] of vm_offset_t - ctype: emulation_vector_t; - /* XXX compatibility */ - type rpc_signature_info_t = array[*:1024] of int; #if KERNEL_SERVER diff --git a/kern/compat_xxx_defs.h b/kern/compat_xxx_defs.h deleted file mode 100644 index 1878bb22..00000000 --- a/kern/compat_xxx_defs.h +++ /dev/null @@ -1,64 +0,0 @@ -/* - * Mach Operating System - * Copyright (c) 1991 Carnegie Mellon University. - * Copyright (c) 1993,1994 The University of Utah and - * the Computer Systems Laboratory (CSL). - * All rights reserved. - * - * Permission to use, copy, modify and distribute this software and its - * documentation is hereby granted, provided that both the copyright - * notice and this permission notice appear in all copies of the - * software, derivative works or modified versions, and any portions - * thereof, and that both notices appear in supporting documentation. - * - * CARNEGIE MELLON, THE UNIVERSITY OF UTAH AND CSL ALLOW FREE USE OF - * THIS SOFTWARE IN ITS "AS IS" CONDITION, AND DISCLAIM ANY LIABILITY - * OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF - * THIS SOFTWARE. - * - * Carnegie Mellon requests users of this software to return to - * - * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU - * School of Computer Science - * Carnegie Mellon University - * Pittsburgh PA 15213-3890 - * - * any improvements or extensions that they make and grant Carnegie Mellon - * the rights to redistribute these changes. - */ -/* - * Compatibility definitions for the MiG-related changes - * to various routines. - * - * When all user code has been relinked, this file and the xxx_ - * and yyy_ routines MUST be removed! - */ - -/* from mach.defs */ - -#define xxx_task_info task_info -#ifdef MIGRATING_THREADS -#define xxx_thread_get_state act_get_state -#define xxx_thread_set_state act_set_state -#define xxx_thread_info act_info -#else -#define xxx_thread_get_state thread_get_state -#define xxx_thread_set_state thread_set_state -#define xxx_thread_info thread_info -#endif /* MIGRATING_THREADS */ - -/* from mach_host.defs */ - -#define yyy_host_info host_info -#define yyy_processor_info processor_info -#define yyy_processor_set_info processor_set_info -#define yyy_processor_control processor_control - -/* from device.defs */ - -#define ds_xxx_device_set_status ds_device_set_status -#define ds_xxx_device_get_status ds_device_get_status -#define ds_xxx_device_set_filter ds_device_set_filter - - - diff --git a/kern/ipc_host.c b/kern/ipc_host.c index ea8f03ad..cd1c11ab 100644 --- a/kern/ipc_host.c +++ b/kern/ipc_host.c @@ -199,10 +199,9 @@ ipc_pset_terminate( } /* - * processor_set_default, processor_set_default_priv: + * processor_set_default: * - * Return ports for manipulating default_processor set. MiG code - * differentiates between these two routines. + * Return ports for manipulating default_processor set. */ kern_return_t processor_set_default( @@ -217,19 +216,6 @@ processor_set_default( return KERN_SUCCESS; } -kern_return_t -xxx_processor_set_default_priv( - host_t host, - processor_set_t *pset) -{ - if (host == HOST_NULL) - return KERN_INVALID_ARGUMENT; - - *pset = &default_pset; - pset_reference(*pset); - return KERN_SUCCESS; -} - /* * Routine: convert_port_to_host * Purpose: diff --git a/kern/mach.srv b/kern/mach.srv index 3ed92593..b1cec606 100644 --- a/kern/mach.srv +++ b/kern/mach.srv @@ -37,6 +37,4 @@ #define thread_get_special_port act_get_special_port #endif /* MIGRATING_THREADS */ -simport <kern/compat_xxx_defs.h>; /* for obsolete routines */ - #include <mach/mach.defs> diff --git a/kern/mach_host.srv b/kern/mach_host.srv index 30d78db2..a18ab1cf 100644 --- a/kern/mach_host.srv +++ b/kern/mach_host.srv @@ -23,8 +23,6 @@ #define KERNEL_SERVER 1 -simport <kern/compat_xxx_defs.h>; /* for obsolete routines */ - #ifdef MIGRATING_THREADS #define thread_assign act_thread_assign #define thread_assign_default act_thread_assign_default diff --git a/kern/machine.c b/kern/machine.c index bcf394c3..c2a19b99 100644 --- a/kern/machine.c +++ b/kern/machine.c @@ -67,60 +67,6 @@ queue_head_t action_queue; /* assign/shutdown queue */ decl_simple_lock_data(,action_lock); /* - * xxx_host_info: - * - * Return the host_info structure. This routine is exported to the - * user level. - */ -kern_return_t xxx_host_info(task, info) - task_t task; - machine_info_t info; -{ -#ifdef lint - task++; -#endif /* lint */ - *info = machine_info; - return(KERN_SUCCESS); -} - -/* - * xxx_slot_info: - * - * Return the slot_info structure for the specified slot. This routine - * is exported to the user level. - */ -kern_return_t xxx_slot_info(task, slot, info) - task_t task; - int slot; - machine_slot_t info; -{ -#ifdef lint - task++; -#endif /* lint */ - if ((slot < 0) || (slot >= NCPUS)) - return(KERN_INVALID_ARGUMENT); - *info = machine_slot[slot]; - return(KERN_SUCCESS); -} - -/* - * xxx_cpu_control: - * - * Support for user control of cpus. The user indicates which cpu - * he is interested in, and whether or not that cpu should be running. - */ -kern_return_t xxx_cpu_control(task, cpu, runnable) - task_t task; - int cpu; - boolean_t runnable; -{ -#ifdef lint - task++; cpu++; runnable++; -#endif /* lint */ - return(KERN_FAILURE); -} - -/* * cpu_up: * * Flag specified cpu as up and running. Called when a processor comes diff --git a/kern/printf.h b/kern/printf.h index c5effe5d..22681116 100644 --- a/kern/printf.h +++ b/kern/printf.h @@ -40,6 +40,7 @@ extern void printnum (unsigned long u, int base, vm_offset_t putc_arg); extern int sprintf (char *buf, const char *fmt, ...); +extern int vsnprintf (char *buf, int size, const char *fmt, va_list args); extern int printf (const char *fmt, ...); diff --git a/kern/syscall_emulation.c b/kern/syscall_emulation.c index 06781d5b..c1c3096c 100644 --- a/kern/syscall_emulation.c +++ b/kern/syscall_emulation.c @@ -336,24 +336,6 @@ task_set_emulation_vector(task, vector_start, emulation_vector, } /* - * Compatibility entry. Vector is passed inline. - */ -kern_return_t -xxx_task_set_emulation_vector(task, vector_start, emulation_vector, - emulation_vector_count) - task_t task; - int vector_start; - emulation_vector_t emulation_vector; - unsigned int emulation_vector_count; -{ - return task_set_emulation_vector_internal( - task, - vector_start, - emulation_vector, - emulation_vector_count); -} - -/* * task_get_emulation_vector: [Server Entry] * * Get the list of emulated system calls for this task. @@ -460,53 +442,6 @@ task_get_emulation_vector(task, vector_start, emulation_vector, } /* - * xxx_task_get_emulation: [Server Entry] - * get the list of emulated system calls for this task. - * Compatibility code: return list in-line. - */ -kern_return_t -xxx_task_get_emulation_vector(task, vector_start, emulation_vector, - emulation_vector_count) - task_t task; - int *vector_start; - emulation_vector_t emulation_vector; /* pointer to OUT array */ - unsigned int *emulation_vector_count; /*IN/OUT*/ -{ - register eml_dispatch_t eml; - - if (task == TASK_NULL) - return( EML_BAD_TASK ); - - task_lock(task); - - eml = task->eml_dispatch; - if (eml == EML_DISPATCH_NULL) { - task_unlock(task); - *vector_start = 0; - *emulation_vector_count = 0; - return( KERN_SUCCESS ); - } - - simple_lock(&eml->lock); - - if (*emulation_vector_count < eml->disp_count) { - simple_unlock(&eml->lock); - task_unlock(task); - return( EML_BAD_CNT ); - } - - *vector_start = eml->disp_min; - *emulation_vector_count = eml->disp_count; - memcpy(emulation_vector, eml->disp_vector, - *emulation_vector_count * sizeof(vm_offset_t)); - simple_unlock(&eml->lock); - - task_unlock(task); - - return( KERN_SUCCESS ); -} - -/* * task_set_emulation: [Server Entry] * set up for user space emulation of syscalls within this task. */ 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/drivers/block/floppy.c b/linux/dev/drivers/block/floppy.c index d297e617..83943ee1 100644 --- a/linux/dev/drivers/block/floppy.c +++ b/linux/dev/drivers/block/floppy.c @@ -1413,7 +1413,7 @@ static int interpret_errors(void) */ static void setup_rw_floppy(void) { - int i,ready_date,r, flags,dflags; + int i, ready_date, r, flags; timeout_fn function; flags = raw_cmd->flags; @@ -1436,7 +1436,6 @@ static void setup_rw_floppy(void) if (wait_for_completion(ready_date,function)) return; } - dflags = DRS->flags; if ((flags & FD_RAW_READ) || (flags & FD_RAW_WRITE)) setup_DMA(); @@ -4276,11 +4275,10 @@ void cleanup_module(void) * resource contention. */ void floppy_eject(void) { - int dummy; if(floppy_grab_irq_and_dma()==0) { lock_fdc(MAXTIMEOUT,0); - dummy=fd_eject(0); + fd_eject(0); process_fd_request(); floppy_release_irq_and_dma(); } 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/kmem.c b/linux/dev/glue/kmem.c index d1784a5e..367895bd 100644 --- a/linux/dev/glue/kmem.c +++ b/linux/dev/glue/kmem.c @@ -554,7 +554,7 @@ vfree (void *addr) if (!p) panic ("vmalloc_list_lookup failure"); - kmem_free (kernel_map, addr, p->size); + kmem_free (kernel_map, (vm_offset_t) addr, p->size); vmalloc_list_remove (p); } 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/init/main.c b/linux/dev/init/main.c index 3a889832..f5c4832f 100644 --- a/linux/dev/init/main.c +++ b/linux/dev/init/main.c @@ -48,6 +48,7 @@ #include <linux/delay.h> #include <linux/ioport.h> #include <linux/string.h> +#include <linux/pci.h> #include <linux/dev/glue/glue.h> #include <asm/system.h> 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/printk.c b/linux/dev/kernel/printk.c index 1c45b245..8bed0d2a 100644 --- a/linux/dev/kernel/printk.c +++ b/linux/dev/kernel/printk.c @@ -27,6 +27,7 @@ #include <stdarg.h> #include <asm/system.h> #include <kern/assert.h> +#include <kern/printf.h> #include <device/cons.h> static char buf[2048]; 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; } diff --git a/linux/src/drivers/net/8390.c b/linux/src/drivers/net/8390.c index 9864106b..93c485d6 100644 --- a/linux/src/drivers/net/8390.c +++ b/linux/src/drivers/net/8390.c @@ -706,13 +706,10 @@ int ethdev_init(struct device *dev) printk(version); if (dev->priv == NULL) { - struct ei_device *ei_local; - dev->priv = kmalloc(sizeof(struct ei_device), GFP_KERNEL); if (dev->priv == NULL) return -ENOMEM; memset(dev->priv, 0, sizeof(struct ei_device)); - ei_local = (struct ei_device *)dev->priv; } dev->hard_start_xmit = &ei_start_xmit; diff --git a/linux/src/drivers/scsi/gdth.c b/linux/src/drivers/scsi/gdth.c index 6cc2b780..0a4bef89 100644 --- a/linux/src/drivers/scsi/gdth.c +++ b/linux/src/drivers/scsi/gdth.c @@ -2851,8 +2851,9 @@ __initfunc (int gdth_detect(Scsi_Host_Template *shtp)) ushort eisa_slot,device_id,index; gdth_pci_str pcistr; int i,j,hanum; +#if LINUX_VERSION_CODE < 0x020000 unchar b; - +#endif #ifdef DEBUG_GDTH printk("GDT: This driver contains debugging information !! Trace level = %d\n", @@ -2878,7 +2879,7 @@ __initfunc (int gdth_detect(Scsi_Host_Template *shtp)) } /* initializations */ - gdth_polling = TRUE; b = 0; + gdth_polling = TRUE; for (i=0; i<GDTH_MAXCMDS; ++i) for (j=0; j<MAXHA; ++j) gdth_cmd_tab[i][j].cmnd = UNUSED_CMND; diff --git a/linux/src/drivers/scsi/ppa.c b/linux/src/drivers/scsi/ppa.c index 5063a677..fd224f9e 100644 --- a/linux/src/drivers/scsi/ppa.c +++ b/linux/src/drivers/scsi/ppa.c @@ -259,7 +259,6 @@ int ppa_detect(Scsi_Host_Template * host) struct Scsi_Host *hreg; int ports; int i, nhosts; - unsigned short ppb; printk("ppa: Version %s\n", PPA_VERSION); nhosts = 0; @@ -267,7 +266,7 @@ int ppa_detect(Scsi_Host_Template * host) for (i = 0; i < parbus_no; i++) { if (parbus_base[i] == 0x0000) continue; - ppb = ppa_hosts[i].base = parbus_base[i]; + ppa_hosts[i].base = parbus_base[i]; /* sanity checks */ if (check_region(parbus_base[i], @@ -518,7 +517,7 @@ static inline int ppa_byte_in(unsigned short base, char *buffer, int len) " shrb $4,%%al\n" \ " orb %%al," #reg "\n" -static inline int ppa_nibble_in(unsigned short str_p, char *buffer, int len) +static inline int ppa_nibble_in(unsigned short base, char *buffer, int len) { for (; len; len--) { unsigned char h; diff --git a/vm/memory_object.c b/vm/memory_object.c index 57dde76b..e281c6a3 100644 --- a/vm/memory_object.c +++ b/vm/memory_object.c @@ -891,34 +891,6 @@ MACRO_END return (KERN_SUCCESS); } -/* - * Old version of memory_object_lock_request. - */ -kern_return_t -xxx_memory_object_lock_request(object, offset, size, - should_clean, should_flush, prot, - reply_to, reply_to_type) - register vm_object_t object; - register vm_offset_t offset; - register vm_size_t size; - boolean_t should_clean; - boolean_t should_flush; - vm_prot_t prot; - ipc_port_t reply_to; - mach_msg_type_name_t reply_to_type; -{ - register int should_return; - - if (should_clean) - should_return = MEMORY_OBJECT_RETURN_DIRTY; - else - should_return = MEMORY_OBJECT_RETURN_NONE; - - return(memory_object_lock_request(object,offset,size, - should_return, should_flush, prot, - reply_to, reply_to_type)); -} - kern_return_t memory_object_set_attributes_common(object, object_ready, may_cache, copy_strategy, use_old_pageout) |