summaryrefslogtreecommitdiff
path: root/debian/patches/15_mem_obj_proxy.patch
diff options
context:
space:
mode:
authorGuillem Jover <guillem@debian.org>2009-02-20 01:18:48 +0000
committerGuillem Jover <guillem@debian.org>2009-02-20 01:18:48 +0000
commite2645532ad48566e6cc6751a4ccdd13c5c14d898 (patch)
tree5b0e446ffa15dbddb7390aecbb29784deaf234a8 /debian/patches/15_mem_obj_proxy.patch
parentb9ac4f3f17839f4e8bb88564b20e2e70921f4ca2 (diff)
Sync with upstream gnumach snapshot 1.3.99.dfsg.cvs20090220
Diffstat (limited to 'debian/patches/15_mem_obj_proxy.patch')
-rw-r--r--debian/patches/15_mem_obj_proxy.patch8
1 files changed, 4 insertions, 4 deletions
diff --git a/debian/patches/15_mem_obj_proxy.patch b/debian/patches/15_mem_obj_proxy.patch
index 303c7ce..e73bb4d 100644
--- a/debian/patches/15_mem_obj_proxy.patch
+++ b/debian/patches/15_mem_obj_proxy.patch
@@ -84,7 +84,7 @@ Index: b/kern/ipc_kobject.c
===================================================================
--- a/kern/ipc_kobject.c
+++ b/kern/ipc_kobject.c
-@@ -353,6 +353,9 @@ ipc_kobject_notify(request_header, reply
+@@ -355,6 +355,9 @@ ipc_kobject_notify(request_header, reply
case IKOT_DEVICE:
return ds_notify(request_header);
@@ -320,7 +320,7 @@ Index: b/vm/vm_init.c
===================================================================
--- a/vm/vm_init.c
+++ b/vm/vm_init.c
-@@ -81,4 +81,5 @@ void vm_mem_bootstrap()
+@@ -82,4 +82,5 @@ void vm_mem_bootstrap()
void vm_mem_init()
{
vm_object_init();
@@ -330,7 +330,7 @@ Index: b/vm/vm_user.c
===================================================================
--- a/vm/vm_user.c
+++ b/vm/vm_user.c
-@@ -275,6 +275,12 @@ kern_return_t vm_copy(map, source_addres
+@@ -276,6 +276,12 @@ kern_return_t vm_copy(map, source_addres
return KERN_SUCCESS;
}
@@ -343,7 +343,7 @@ Index: b/vm/vm_user.c
/*
* Routine: vm_map
*/
-@@ -324,7 +330,22 @@ kern_return_t vm_map(
+@@ -325,7 +331,22 @@ kern_return_t vm_map(
copy = FALSE;
} else if ((object = vm_object_enter(memory_object, size, FALSE))
== VM_OBJECT_NULL)