[gnumach] 04/07: Potentially fix crash during ide writes on OOM

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository gnumach.

commit fa6a97c6e496f902b447c054be96c72d760347d0
Author: Samuel Thibault <address@hidden>
Date:   Wed Oct 4 00:12:43 2017 +0000

    Potentially fix crash during ide writes on OOM
    
      * 80_vm_object_coalesce.patch: New patch to potentially avoid coalescing
        between swappable object and non-swappable anonymous area.
---
 debian/changelog                           |  2 ++
 debian/patches/80_vm_object_coalesce.patch | 14 ++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 17 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9f5c838..1e2d8c8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gnumach (2:1.8+git20170911-2) UNRELEASED; urgency=medium
 
   * control: Bump Standards-Version to 4.1.1 (no changes).
+  * 80_vm_object_coalesce.patch: New patch to potentially avoid coalescing
+    between swappable object and non-swappable anonymous area.
 
  -- Samuel Thibault <address@hidden>  Fri, 29 Sep 2017 00:56:26 +0200
 
diff --git a/debian/patches/80_vm_object_coalesce.patch 
b/debian/patches/80_vm_object_coalesce.patch
new file mode 100644
index 0000000..3bece31
--- /dev/null
+++ b/debian/patches/80_vm_object_coalesce.patch
@@ -0,0 +1,14 @@
+Index: gnumach/vm/vm_map.c
+===================================================================
+--- gnumach.orig/vm/vm_map.c
++++ gnumach/vm/vm_map.c
+@@ -1033,7 +1033,8 @@ kern_return_t vm_map_enter(
+        *      extend from below.]
+        */
+ 
+-      if ((object == VM_OBJECT_NULL) &&
++      if (0 &&
++          (object == VM_OBJECT_NULL) &&
+           (entry != vm_map_to_entry(map)) &&
+           (entry->vme_end == start) &&
+           (!entry->is_shared) &&
diff --git a/debian/patches/series b/debian/patches/series
index 6b53fb5..5fe7437 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
 50_initrd.patch
 70_dde.patch
 79_dde-debian.patch
+80_vm_object_coalesce.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/gnumach.git