[gnumach] 01/01: Re-enable patches/git-kentry_data_size.patch,

[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 2653d0a78ac66478f0ca40d5d653f010f2f531e6
Author: Samuel Thibault <address@hidden>
Date:   Tue Feb 11 23:49:25 2014 +0000

    Re-enable patches/git-kentry_data_size.patch,
    
    but with an additional change to reduce KMEM_MAP_SIZE by 64MiB to make room 
for
    that.
---
 debian/changelog                          |  7 +++++++
 debian/patches/git-kentry_data_size.patch | 17 +++++++++++++++++
 debian/patches/series                     |  2 +-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6e6a283..1627a05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnumach (2:1.4-6) unstable; urgency=medium
+
+  * Re-enable patches/git-kentry_data_size.patch, but with an additional
+    change to reduce KMEM_MAP_SIZE by 64MiB to make room for that.
+
+ -- Samuel Thibault <address@hidden>  Tue, 11 Feb 2014 23:47:14 +0000
+
 gnumach (2:1.4-5) unstable; urgency=medium
 
   * Disable patches/git-kentry_data_size.patch for now, it breaks d-i boot for
diff --git a/debian/patches/git-kentry_data_size.patch 
b/debian/patches/git-kentry_data_size.patch
index a6138eb..2fba5d4 100644
--- a/debian/patches/git-kentry_data_size.patch
+++ b/debian/patches/git-kentry_data_size.patch
@@ -19,3 +19,20 @@ index 5fdac4e..1caf9ae 100644
  
  /*
   *    Types defined:
+
+
+Additionally reduce the slab size to 64MiB to make room for that.
+
+diff --git a/kern/slab.c b/kern/slab.c
+index 47c2c8f..4034579 100644
+--- a/kern/slab.c
++++ b/kern/slab.c
+@@ -165,7 +165,7 @@
+ /*
+  * Size of the VM submap from which default backend functions allocate.
+  */
+-#define KMEM_MAP_SIZE (128 * 1024 * 1024)
++#define KMEM_MAP_SIZE (64 * 1024 * 1024)
+ 
+ /*
+  * Shift for the first kalloc cache size.
diff --git a/debian/patches/series b/debian/patches/series
index 01aee48..81e99a2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,7 +4,7 @@
 60_bigmem.patch
 70_dde.patch
 80_missing_files.patch
-#git-kentry_data_size.patch
+git-kentry_data_size.patch
 git-thread_terminate_release.patch
 git-xen_clock_overflow.patch
 git-cursor_init.patch

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