[gnumach] 01/01: patches/git-vm_map.patch: New patch to fix vm_map with anywhere=true.

[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 fc9e7e9a10b9948c1ef1027d0cb0e181b90da08f
Author: Samuel Thibault <address@hidden>
Date:   Sat Sep 6 12:14:34 2014 +0200

    patches/git-vm_map.patch: New patch to fix vm_map with anywhere=true.
---
 debian/changelog                 |  1 +
 debian/patches/git-vm-tune.patch | 60 ++++++++++------------------------------
 debian/patches/git-vm_map.patch  | 27 ++++++++++++++++++
 debian/patches/series            |  1 +
 4 files changed, 43 insertions(+), 46 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ac61486..e7055f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gnumach (2:1.4-12) UNRELEASED; urgency=medium
   * rules: Rebuild info documentation once (in the source tree) before building
     all variants in parallel. Closes: Bug#756909.
   * patches/git-vm-tune.patch: New patch that tunes VM parameters.
+  * patches/git-vm_map.patch: New patch to fix vm_map with anywhere=true.
 
  -- Samuel Thibault <address@hidden>  Mon, 11 Aug 2014 23:12:59 +0200
 
diff --git a/debian/patches/git-vm-tune.patch b/debian/patches/git-vm-tune.patch
index ed42ffd..26128c7 100644
--- a/debian/patches/git-vm-tune.patch
+++ b/debian/patches/git-vm-tune.patch
@@ -9,8 +9,6 @@ Date:   Sat Aug 30 12:48:44 2014 +0200
     
     * xen/grant.c (NR_GRANT_PAGES): Increase from 4 to 8.
 
-diff --git a/xen/grant.c b/xen/grant.c
-index 3d5c3fe..ae3a7bf 100644
 --- a/xen/grant.c
 +++ b/xen/grant.c
 @@ -25,7 +25,7 @@
@@ -22,47 +20,9 @@ index 3d5c3fe..ae3a7bf 100644
  
  decl_simple_lock_data(static,lock);
  static struct grant_entry *grants;
-commit c7cdf5ff96e7c3bb008877893aa194908dca2185
-Author: Samuel Thibault <address@hidden>
-Date:   Sat Aug 30 12:51:11 2014 +0200
-
-    Increate the pageout thread priority
-    
-    * vm/vm_pageout.c (vm_pageout): Set the priority to 0.
-
-diff --git a/vm/vm_pageout.c b/vm/vm_pageout.c
-index 7ac43d6..d57da78 100644
 --- a/vm/vm_pageout.c
 +++ b/vm/vm_pageout.c
-@@ -912,6 +912,7 @@ void vm_pageout(void)
- 
-       current_thread()->vm_privilege = TRUE;
-       stack_privilege(current_thread());
-+      thread_set_own_priority(0);
- 
-       /*
-        *      Initialize some paging parameters.
-commit 91f0887ca2345c2bd02747e4b437076641d77cd9
-Author: Samuel Thibault <address@hidden>
-Date:   Sat Aug 30 12:55:14 2014 +0200
-
-    Tune pageout parameters
-    
-    This targets having always at least 8% free memory instead of just 1%.
-    This has shown improving buildd stability a lot. Also increase the
-    reserved amount to nowadays standards.
-    
-    * vm/vm_pageout.c (VM_PAGE_FREE_TARGET): Increase to 10%.
-    (VM_PAGE_FREE_MIN): Increase to 8%.
-    (VM_PAGE_FREE_RESERVED): Increase to 500 pages.
-    (VM_PAGEOUT_RESERVED_INTERNAL): Increase to 150 pages.
-    (VM_PAGEOUT_RESERVED_REALLY): Increase to 100 pages.
-
-diff --git a/vm/vm_pageout.c b/vm/vm_pageout.c
-index d57da78..ecedb57 100644
---- a/vm/vm_pageout.c
-+++ b/vm/vm_pageout.c
-@@ -97,7 +97,7 @@
+@@ -98,7 +98,7 @@
   */
  
  #ifndef       VM_PAGE_FREE_TARGET
@@ -71,7 +31,7 @@ index d57da78..ecedb57 100644
  #endif        /* VM_PAGE_FREE_TARGET */
  
  /*
-@@ -106,7 +106,7 @@
+@@ -107,7 +107,7 @@
   */
  
  #ifndef       VM_PAGE_FREE_MIN
@@ -80,7 +40,7 @@ index d57da78..ecedb57 100644
  #endif        /* VM_PAGE_FREE_MIN */
  
  /*      When vm_page_external_count exceeds vm_page_external_limit, 
-@@ -132,7 +132,7 @@
+@@ -133,7 +133,7 @@
   *    operation by dipping into the reserved pool of pages.  */
  
  #ifndef       VM_PAGE_FREE_RESERVED
@@ -89,7 +49,7 @@ index d57da78..ecedb57 100644
  #endif        /* VM_PAGE_FREE_RESERVED */
  
  /*
-@@ -144,7 +144,7 @@
+@@ -145,7 +145,7 @@
   */
  
  #ifndef       VM_PAGEOUT_RESERVED_INTERNAL
@@ -98,7 +58,7 @@ index d57da78..ecedb57 100644
  #endif        /* VM_PAGEOUT_RESERVED_INTERNAL */
  
  /*
-@@ -156,7 +156,7 @@
+@@ -157,7 +157,7 @@
   */
  
  #ifndef       VM_PAGEOUT_RESERVED_REALLY
@@ -106,4 +66,12 @@ index d57da78..ecedb57 100644
 +#define       VM_PAGEOUT_RESERVED_REALLY(reserve)     ((reserve) - 400)
  #endif        /* VM_PAGEOUT_RESERVED_REALLY */
  
- unsigned int vm_pageout_reserved_internal = 0;
+ extern void vm_pageout_continue();
+@@ -916,6 +916,7 @@ void vm_pageout()
+ 
+       current_thread()->vm_privilege = TRUE;
+       stack_privilege(current_thread());
++      thread_set_own_priority(0);
+ 
+       /*
+        *      Initialize some paging parameters.
diff --git a/debian/patches/git-vm_map.patch b/debian/patches/git-vm_map.patch
new file mode 100644
index 0000000..006cce9
--- /dev/null
+++ b/debian/patches/git-vm_map.patch
@@ -0,0 +1,27 @@
+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 a/vm/vm_user.c b/vm/vm_user.c
+index f7c87cc..1d8f37b 100644
+--- a/vm/vm_user.c
++++ b/vm/vm_user.c
+@@ -336,7 +336,10 @@ kern_return_t vm_map(
+       if (size == 0)
+               return KERN_INVALID_ARGUMENT;
+ 
+-      *address = trunc_page(*address);
++      if (anywhere)
++              *address = vm_map_min(target_map);
++      else
++              *address = trunc_page(*address);
+       size = round_page(size);
+ 
+       if (!IP_VALID(memory_object)) {
diff --git a/debian/patches/series b/debian/patches/series
index 6a35a12..29a2c52 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -23,3 +23,4 @@ git-mach_debug2.patch
 git-halt.patch
 git-xen_races.patch
 git-vm-tune.patch
+git-vm_map.patch

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