diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-07-21 19:34:47 +0200 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2015-07-21 19:34:47 +0200 |
| commit | a2952398e5de8746a761a59686619d08d376bce3 (patch) | |
| tree | df2373bb1119468873c667624769455c36dc3786 /kern/ipc_kobject.c | |
| parent | ba1b3afd50913473f3036a63b4a82d7ba5c42009 (diff) | |
| parent | 92e98a7f4d4fa75b286a067e1d1caef514fccb0d (diff) | |
Merge branch 'master' into master-gdb_stubs
Diffstat (limited to 'kern/ipc_kobject.c')
| -rw-r--r-- | kern/ipc_kobject.c | 30 |
1 files changed, 14 insertions, 16 deletions
diff --git a/kern/ipc_kobject.c b/kern/ipc_kobject.c index 37d4eb99..709ec9ec 100644 --- a/kern/ipc_kobject.c +++ b/kern/ipc_kobject.c @@ -49,8 +49,21 @@ #include <vm/memory_object_proxy.h> #include <device/ds_routines.h> +#include <kern/mach.server.h> +#include <ipc/mach_port.server.h> +#include <kern/mach_host.server.h> +#include <device/device.server.h> +#include <device/device_pager.server.h> +#include <kern/mach4.server.h> +#include <kern/gnumach.server.h> + +#if MACH_DEBUG +#include <kern/mach_debug.server.h> +#endif + #if MACH_MACHINE_ROUTINES #include <machine/machine_routines.h> +#include MACHINE_SERVER_HEADER #endif @@ -146,21 +159,6 @@ ipc_kobject_server(request) * to perform the kernel function */ { - extern mig_routine_t mach_server_routine(), - mach_port_server_routine(), - mach_host_server_routine(), - device_server_routine(), - device_pager_server_routine(), - mach4_server_routine(), - gnumach_server_routine(); -#if MACH_DEBUG - extern mig_routine_t mach_debug_server_routine(); -#endif - -#if MACH_MACHINE_ROUTINES - extern mig_routine_t MACHINE_SERVER_ROUTINE(); -#endif - check_simple_locks(); if ((routine = mach_server_routine(&request->ikm_header)) != 0 || (routine = mach_port_server_routine(&request->ikm_header)) != 0 @@ -246,7 +244,7 @@ ipc_kobject_server(request) } else { /* * The message contents of the request are intact. - * Destroy everthing except the reply port right, + * Destroy everything except the reply port right, * which is needed in the reply message. */ |