summaryrefslogtreecommitdiff
path: root/kern
diff options
context:
space:
mode:
Diffstat (limited to 'kern')
-rw-r--r--kern/ast.c6
-rw-r--r--kern/debug.c7
-rw-r--r--kern/exception.c4
-rw-r--r--kern/ipc_kobject.c30
-rw-r--r--kern/ipc_mig.c118
-rw-r--r--kern/machine.c7
-rw-r--r--kern/startup.c17
-rw-r--r--kern/task.c17
-rw-r--r--kern/task.h5
9 files changed, 0 insertions, 211 deletions
diff --git a/kern/ast.c b/kern/ast.c
index 9b3a9bd..9498ce7 100644
--- a/kern/ast.c
+++ b/kern/ast.c
@@ -37,7 +37,6 @@
#include <cpus.h>
#include <mach_fixpri.h>
-#include <norma_ipc.h>
#include <kern/ast.h>
#include <kern/counters.h>
@@ -90,11 +89,6 @@ ast_taken()
if (reasons & AST_NETWORK)
net_ast();
-#if NORMA_IPC
- if (reasons & AST_NETIPC)
- netipc_ast();
-#endif /* NORMA_IPC */
-
/*
* Make darn sure that we don't call thread_halt_self
* or thread_block from the idle thread.
diff --git a/kern/debug.c b/kern/debug.c
index 2ba15fe..3827e8f 100644
--- a/kern/debug.c
+++ b/kern/debug.c
@@ -27,7 +27,6 @@
#include <stdarg.h>
#include <mach_kdb.h>
-#include <norma_ipc.h>
#include <cpus.h>
#include "cpu_number.h"
@@ -126,9 +125,6 @@ void
panic(const char *s, ...)
{
va_list listp;
-#if NORMA_IPC
- extern int _node_self; /* node_self() may not be callable yet */
-#endif /* NORMA_IPC */
panic_init();
@@ -146,9 +142,6 @@ panic(const char *s, ...)
}
simple_unlock(&panic_lock);
printf("panic");
-#if NORMA_IPC
- printf("(node %U)", _node_self);
-#endif
#if NCPUS > 1
printf("(cpu %U)", paniccpu);
#endif
diff --git a/kern/exception.c b/kern/exception.c
index 6820bbf..e8b9c0e 100644
--- a/kern/exception.c
+++ b/kern/exception.c
@@ -24,7 +24,6 @@
* the rights to redistribute these changes.
*/
-#include <norma_ipc.h>
#include <mach_kdb.h>
#include <mach/boolean.h>
@@ -420,9 +419,6 @@ exception_raise(dest_port, thread_port, task_port,
}
if (!ip_active(dest_port) ||
-#if NORMA_IPC
- IP_NORMA_IS_PROXY(dest_port) ||
-#endif /* NORMA_IPC */
(dest_port->ip_receiver == ipc_space_kernel)) {
imq_unlock(reply_mqueue);
ip_unlock(dest_port);
diff --git a/kern/ipc_kobject.c b/kern/ipc_kobject.c
index 5c6e011..60db89c 100644
--- a/kern/ipc_kobject.c
+++ b/kern/ipc_kobject.c
@@ -36,8 +36,6 @@
#include <mach_debug.h>
#include <mach_ipc_test.h>
#include <mach_machine_routines.h>
-#include <norma_task.h>
-#include <norma_vm.h>
#include <mach/port.h>
#include <mach/kern_return.h>
@@ -156,13 +154,6 @@ ipc_kobject_server(request)
#if MACH_DEBUG
extern mig_routine_t mach_debug_server_routine();
#endif
-#if NORMA_TASK
- extern mig_routine_t mach_norma_server_routine();
- extern mig_routine_t norma_internal_server_routine();
-#endif
-#if NORMA_VM
- extern mig_routine_t proxy_server_routine();
-#endif
#if MACH_MACHINE_ROUTINES
extern mig_routine_t MACHINE_SERVER_ROUTINE();
@@ -177,13 +168,6 @@ ipc_kobject_server(request)
#if MACH_DEBUG
|| (routine = mach_debug_server_routine(&request->ikm_header)) != 0
#endif /* MACH_DEBUG */
-#if NORMA_TASK
- || (routine = mach_norma_server_routine(&request->ikm_header)) != 0
- || (routine = norma_internal_server_routine(&request->ikm_header)) != 0
-#endif /* NORMA_TASK */
-#if NORMA_VM
- || (routine = proxy_server_routine(&request->ikm_header)) != 0
-#endif /* NORMA_VM */
|| (routine = mach4_server_routine(&request->ikm_header)) != 0
#if MACH_MACHINE_ROUTINES
|| (routine = MACHINE_SERVER_ROUTINE(&request->ikm_header)) != 0
@@ -368,20 +352,6 @@ ipc_kobject_notify(request_header, reply_header)
return FALSE;
}
switch (ip_kotype(port)) {
-#if NORMA_VM
- case IKOT_XMM_OBJECT:
- return xmm_object_notify(request_header);
-
- case IKOT_XMM_PAGER:
- return xmm_pager_notify(request_header);
-
- case IKOT_XMM_KERNEL:
- return xmm_kernel_notify(request_header);
-
- case IKOT_XMM_REPLY:
- return xmm_reply_notify(request_header);
-#endif /* NORMA_VM */
-
case IKOT_DEVICE:
return ds_notify(request_header);
diff --git a/kern/ipc_mig.c b/kern/ipc_mig.c
index f90c512..4f45eba 100644
--- a/kern/ipc_mig.c
+++ b/kern/ipc_mig.c
@@ -24,8 +24,6 @@
* the rights to redistribute these changes.
*/
-#include <norma_vm.h>
-
#include <mach/boolean.h>
#include <mach/port.h>
#include <mach/message.h>
@@ -94,122 +92,6 @@ mach_msg_rpc_from_kernel(msg, send_size, reply_size)
panic("mach_msg_rpc_from_kernel"); /*XXX*/
}
-#if NORMA_VM
-/*
- * Routine: mach_msg_rpc_from_kernel
- * Purpose:
- * Send a message from the kernel and receive a reply.
- * Uses ith_rpc_reply for the reply port.
- *
- * This is used by the client side of KernelUser interfaces
- * to implement Routines.
- * Conditions:
- * Nothing locked.
- * Returns:
- * MACH_MSG_SUCCESS Sent the message.
- * MACH_RCV_PORT_DIED The reply port was deallocated.
- */
-
-mach_msg_return_t
-mach_msg_rpc_from_kernel(
- mach_msg_header_t *msg,
- mach_msg_size_t send_size,
- mach_msg_size_t rcv_size)
-{
- ipc_thread_t self = current_thread();
- ipc_port_t reply;
- ipc_kmsg_t kmsg;
- mach_port_seqno_t seqno;
- mach_msg_return_t mr;
-
- assert(MACH_PORT_VALID(msg->msgh_remote_port));
- assert(msg->msgh_local_port == MACH_PORT_NULL);
-
- mr = ipc_kmsg_get_from_kernel(msg, send_size, &kmsg);
- if (mr != MACH_MSG_SUCCESS)
- panic("mach_msg_rpc_from_kernel");
-
- ipc_kmsg_copyin_from_kernel(kmsg);
-
- ith_lock(self);
- assert(self->ith_self != IP_NULL);
-
- reply = self->ith_rpc_reply;
- if (reply == IP_NULL) {
- ith_unlock(self);
- reply = ipc_port_alloc_reply();
- ith_lock(self);
- if ((reply == IP_NULL) ||
- (self->ith_rpc_reply != IP_NULL))
- panic("mach_msg_rpc_from_kernel");
- self->ith_rpc_reply = reply;
- }
-
- /* insert send-once right for the reply port */
- kmsg->ikm_header.msgh_local_port =
- (mach_port_t) ipc_port_make_sonce(reply);
-
- ipc_port_reference(reply);
- ith_unlock(self);
-
- ipc_mqueue_send_always(kmsg);
-
- for (;;) {
- ipc_mqueue_t mqueue;
-
- ip_lock(reply);
- if (!ip_active(reply)) {
- ip_unlock(reply);
- ipc_port_release(reply);
- return MACH_RCV_PORT_DIED;
- }
-
- assert(reply->ip_pset == IPS_NULL);
- mqueue = &reply->ip_messages;
- imq_lock(mqueue);
- ip_unlock(reply);
-
- mr = ipc_mqueue_receive(mqueue, MACH_MSG_OPTION_NONE,
- MACH_MSG_SIZE_MAX,
- MACH_MSG_TIMEOUT_NONE,
- FALSE, IMQ_NULL_CONTINUE,
- &kmsg, &seqno);
- /* mqueue is unlocked */
- if (mr == MACH_MSG_SUCCESS)
- break;
-
- assert((mr == MACH_RCV_INTERRUPTED) ||
- (mr == MACH_RCV_PORT_DIED));
-
- while (thread_should_halt(self)) {
- /* don't terminate while holding a reference */
- if (self->ast & AST_TERMINATE)
- ipc_port_release(reply);
- thread_halt_self();
- }
- }
- ipc_port_release(reply);
-
- kmsg->ikm_header.msgh_seqno = seqno;
-
- if (rcv_size < kmsg->ikm_header.msgh_size) {
- ipc_kmsg_copyout_dest(kmsg, ipc_space_reply);
- ipc_kmsg_put_to_kernel(msg, kmsg, kmsg->ikm_header.msgh_size);
- return MACH_RCV_TOO_LARGE;
- }
-
- /*
- * We want to preserve rights and memory in reply!
- * We don't have to put them anywhere; just leave them
- * as they are.
- */
-
- ipc_kmsg_copyout_to_kernel(kmsg, ipc_space_reply);
- ipc_kmsg_put_to_kernel(msg, kmsg, kmsg->ikm_header.msgh_size);
- return MACH_MSG_SUCCESS;
-}
-#endif /* NORMA_VM */
-
/*
* Routine: mach_msg_abort_rpc
* Purpose:
diff --git a/kern/machine.c b/kern/machine.c
index 67bcbbb..5dba1ae 100644
--- a/kern/machine.c
+++ b/kern/machine.c
@@ -34,7 +34,6 @@
* Support for machine independent machine abstraction.
*/
-#include <norma_ether.h>
#include <cpus.h>
#include <mach_host.h>
@@ -747,12 +746,6 @@ host_get_boot_info(priv_host, boot_info)
return KERN_INVALID_HOST;
}
-#if NORMA_ETHER
-{
- extern char *norma_ether_boot_info();
- src = norma_ether_boot_info();
-}
-#endif /* NORMA_ETHER */
#if defined(iPSC386) || defined(iPSC860)
{
extern char *ipsc_boot_environ();
diff --git a/kern/startup.c b/kern/startup.c
index 5a2171e..86d109a 100644
--- a/kern/startup.c
+++ b/kern/startup.c
@@ -31,8 +31,6 @@
#include <xpr_debug.h>
#include <cpus.h>
#include <mach_host.h>
-#include <norma_ipc.h>
-#include <norma_vm.h>
#include <mach/boolean.h>
#include <mach/machine.h>
@@ -226,21 +224,6 @@ void start_kernel_threads()
device_service_create();
/*
- * Initialize NORMA ipc system.
- */
-#if NORMA_IPC
- norma_ipc_init();
-#endif /* NORMA_IPC */
-
- /*
- * Initialize NORMA vm system.
- */
-#if NORMA_VM
- norma_vm_init();
-#endif /* NORMA_VM */
-
-
- /*
* Initialize kernel task's creation time.
* When we created the kernel task in task_init, the mapped
* time was not yet available. Now, last thing before starting
diff --git a/kern/task.c b/kern/task.c
index 59b11ee..d7e6082 100644
--- a/kern/task.c
+++ b/kern/task.c
@@ -33,7 +33,6 @@
#include <mach_host.h>
#include <mach_pcsample.h>
-#include <norma_task.h>
#include <fast_tas.h>
#include <mach/machine/vm_types.h>
@@ -53,10 +52,6 @@
#include <vm/vm_kern.h> /* for kernel_map, ipc_kernel_map */
#include <machine/machspl.h> /* for splsched */
-#if NORMA_TASK
-#define task_create task_create_local
-#endif /* NORMA_TASK */
-
task_t kernel_task = TASK_NULL;
zone_t task_zone;
@@ -200,10 +195,6 @@ kern_return_t task_create(
ipc_task_enable(new_task);
-#if NORMA_TASK
- new_task->child_node = -1;
-#endif /* NORMA_TASK */
-
*child_task = new_task;
return KERN_SUCCESS;
}
@@ -230,14 +221,6 @@ void task_deallocate(
if (c != 0)
return;
-#if NORMA_TASK
- if (task->map == VM_MAP_NULL) {
- /* norma placeholder task */
- zfree(task_zone, (vm_offset_t) task);
- return;
- }
-#endif /* NORMA_TASK */
-
eml_task_deallocate(task);
pset = task->processor_set;
diff --git a/kern/task.h b/kern/task.h
index f4feb7f..a3f4302 100644
--- a/kern/task.h
+++ b/kern/task.h
@@ -34,7 +34,6 @@
#ifndef _KERN_TASK_H_
#define _KERN_TASK_H_
-#include <norma_task.h>
#include <fast_tas.h>
#include <mach/boolean.h>
@@ -96,10 +95,6 @@ struct task {
sample_control_t pc_sample;
-#if NORMA_TASK
- long child_node; /* if != -1, node for new children */
-#endif /* NORMA_TASK */
-
#if FAST_TAS
#define TASK_FAST_TAS_NRAS 8
vm_offset_t fast_tas_base[TASK_FAST_TAS_NRAS];