diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-01-16 15:09:41 +0100 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-01-16 15:09:41 +0100 |
| commit | fe1e2a1c09617cc000710ede5fb8099fa1f898c3 (patch) | |
| tree | 36b3cccd3f2236b6bacdd311b303f7044dfc29ff | |
| parent | a8582ee58fe0e39fd0cfd57ca5cf421b5e39b6bb (diff) | |
fix inline_x_server_routines.patch wrt 70_dde.patch
| -rw-r--r-- | debian/patches/inline_x_server_routines.patch | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/debian/patches/inline_x_server_routines.patch b/debian/patches/inline_x_server_routines.patch index e359940..bb8550f 100644 --- a/debian/patches/inline_x_server_routines.patch +++ b/debian/patches/inline_x_server_routines.patch @@ -1,8 +1,6 @@ -diff --git a/kern/ipc_kobject.c b/kern/ipc_kobject.c -index 37d4eb9..13af820 100644 --- a/kern/ipc_kobject.c +++ b/kern/ipc_kobject.c -@@ -49,6 +49,18 @@ +@@ -49,6 +49,19 @@ #include <vm/memory_object_proxy.h> #include <device/ds_routines.h> @@ -13,6 +11,7 @@ index 37d4eb9..13af820 100644 +#include <device/device_pager.server.h> +#include <kern/mach4.server.h> +#include <kern/gnumach.server.h> ++#include <kern/experimental.server.h> + +#if MACH_DEBUG +#include <kern/mach_debug.server.h> @@ -21,7 +20,7 @@ index 37d4eb9..13af820 100644 #if MACH_MACHINE_ROUTINES #include <machine/machine_routines.h> #endif -@@ -146,17 +158,6 @@ ipc_kobject_server(request) +@@ -146,18 +159,6 @@ ipc_kobject_server(request) * to perform the kernel function */ { @@ -31,7 +30,8 @@ index 37d4eb9..13af820 100644 - device_server_routine(), - device_pager_server_routine(), - mach4_server_routine(), -- gnumach_server_routine(); +- gnumach_server_routine(), +- experimental_server_routine(); -#if MACH_DEBUG - extern mig_routine_t mach_debug_server_routine(); -#endif @@ -39,8 +39,6 @@ index 37d4eb9..13af820 100644 #if MACH_MACHINE_ROUTINES extern mig_routine_t MACHINE_SERVER_ROUTINE(); #endif -diff --git a/vm/memory_object_proxy.h b/vm/memory_object_proxy.h -index 3de6996..dc0ea74 100644 --- a/vm/memory_object_proxy.h +++ b/vm/memory_object_proxy.h @@ -30,17 +30,6 @@ |