summaryrefslogtreecommitdiff
path: root/kern
diff options
context:
space:
mode:
authorJustus Winter <4winter@informatik.uni-hamburg.de>2014-04-30 14:40:39 +0200
committerJustus Winter <4winter@informatik.uni-hamburg.de>2014-04-30 14:45:28 +0200
commitb6dab094d2b6531fdc867af906dd006e39cac2d9 (patch)
treeac78c8c6592062b2a0b9d15be0dab46a75e71a99 /kern
parent32b5d3ceb7a120b76f10f69afb6acbf453a76bbc (diff)
kern: include the MIG-generated server headers for MACHINE_SERVER
GNU MIG recently gained support for emitting x_server_routine declarations in the generated server header file. Using this declaration, the x_server_routine functions can be inlined into the ipc_kobject_server function. * kern/ipc_kobject.c: Include the MIG-generated server headers for the machine-dependent interfaces. (ipc_kobject_server): Drop the simple declaration of MACHINE_SERVER_ROUTINE. * i386/i386/machine_routines.h (MACHINE_SERVER_HEADER): New definition.
Diffstat (limited to 'kern')
-rw-r--r--kern/ipc_kobject.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/kern/ipc_kobject.c b/kern/ipc_kobject.c
index 13af820..bf22028 100644
--- a/kern/ipc_kobject.c
+++ b/kern/ipc_kobject.c
@@ -63,6 +63,7 @@
#if MACH_MACHINE_ROUTINES
#include <machine/machine_routines.h>
+#include MACHINE_SERVER_HEADER
#endif
@@ -158,10 +159,6 @@ ipc_kobject_server(request)
* to perform the kernel function
*/
{
-#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