[gnumach] 04/04: patches/git-R-vm_map.patch: Revert upstream commit for now

[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 018e9d6d73aa485eadee13145f61059c5ff48702
Author: Samuel Thibault <address@hidden>
Date:   Sun Nov 9 22:02:48 2014 +0000

    patches/git-R-vm_map.patch: Revert upstream commit for now
    
    it seems to interact badly with paging.
---
 debian/changelog                  |  6 ++++--
 debian/patches/git-R-vm_map.patch | 29 +++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d09790d..0c927b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
 gnumach (2:1.4+git20141109-1) unstable; urgency=medium
 
-  * New upstream snapshot.
+  * New upstream snapshot. Fixes protected payload support.
+  * patches/git-R-vm_map.patch: Revert upstream commit for now, it seems to
+    interact badly with paging.
 
- -- Samuel Thibault <address@hidden>  Sun, 09 Nov 2014 18:14:00 +0000
+ -- Samuel Thibault <address@hidden>  Sun, 09 Nov 2014 22:03:06 +0000
 
 gnumach (2:1.4+git20141107-1) unstable; urgency=medium
 
diff --git a/debian/patches/git-R-vm_map.patch 
b/debian/patches/git-R-vm_map.patch
new file mode 100644
index 0000000..bb39493
--- /dev/null
+++ b/debian/patches/git-R-vm_map.patch
@@ -0,0 +1,29 @@
+Reverting this, it seems to be posing problem with paging.
+
+commit 5ae510e35c54009626999a88f0f1cb34d6dfc94f
+Author: Samuel Thibault <address@hidden>
+Date:   Sat Sep 6 11:55:48 2014 +0200
+
+    Make vm_map really ignore `address' when `anywhere' is true
+    
+    As vm_allocate does.
+    
+    * vm/vm_user.c (vm_map): When `anywhere' is true, set `address' to the
+    minimum address of the `target_map'.
+
+diff --git b/vm/vm_user.c a/vm/vm_user.c
+index 1d8f37b..f7c87cc 100644
+--- b/vm/vm_user.c
++++ a/vm/vm_user.c
+@@ -336,10 +336,7 @@ kern_return_t vm_map(
+       if (size == 0)
+               return KERN_INVALID_ARGUMENT;
+ 
+-      if (anywhere)
+-              *address = vm_map_min(target_map);
+-      else
+-              *address = trunc_page(*address);
++      *address = trunc_page(*address);
+       size = round_page(size);
+ 
+       if (!IP_VALID(memory_object)) {
diff --git a/debian/patches/series b/debian/patches/series
index a95f927..6927ea9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
 50_initrd.patch
 60_bigmem.patch
 70_dde.patch
+git-R-vm_map.patch

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