summaryrefslogtreecommitdiff
path: root/kern
diff options
context:
space:
mode:
Diffstat (limited to 'kern')
-rw-r--r--kern/compat_xxx_defs.h64
-rw-r--r--kern/ipc_host.c18
-rw-r--r--kern/mach.srv2
-rw-r--r--kern/mach_host.srv2
-rw-r--r--kern/machine.c54
-rw-r--r--kern/syscall_emulation.c65
6 files changed, 2 insertions, 203 deletions
diff --git a/kern/compat_xxx_defs.h b/kern/compat_xxx_defs.h
deleted file mode 100644
index 1878bb2..0000000
--- 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 ea8f03a..cd1c11a 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 3ed9259..b1cec60 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 30d78db..a18ab1c 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 bcf394c..c2a19b9 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/syscall_emulation.c b/kern/syscall_emulation.c
index 06781d5..c1c3096 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.
*/