diff options
| author | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-02-12 01:26:54 +0100 |
|---|---|---|
| committer | Justus Winter <4winter@informatik.uni-hamburg.de> | 2014-02-12 01:26:54 +0100 |
| commit | d669f88625dd70b3d895bfb3879d5f32ed081f91 (patch) | |
| tree | 803c332aa372d2b76612593fad6d85cf1f2f8d70 /debian | |
| parent | 42dbe8938ec3f03a0de4fe6570678419d3eca3fe (diff) | |
sync with upstream packaging
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 14 | ||||
| -rw-r--r-- | debian/patches/git-kentry_data_size.patch | 38 | ||||
| -rw-r--r-- | debian/patches/series | 2 |
3 files changed, 53 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index e28cfd5..3a57f7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,17 @@ +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 32MiB to make room for that. + + -- Samuel Thibault <sthibault@debian.org> 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 + some reason. + + -- Samuel Thibault <sthibault@debian.org> Tue, 11 Feb 2014 23:10:46 +0000 + gnumach (2:1.4-4) unstable; urgency=medium * patches/git-quiet-cd-floppy.patch: New patch to quiet down CD and floppy diff --git a/debian/patches/git-kentry_data_size.patch b/debian/patches/git-kentry_data_size.patch new file mode 100644 index 0000000..d7529d2 --- /dev/null +++ b/debian/patches/git-kentry_data_size.patch @@ -0,0 +1,38 @@ +commit dd0989ad8e7526844fcbc2e26bbcc4cc37a010ac +Author: Richard Braun <rbraun@sceen.net> +Date: Thu Oct 10 20:21:17 2013 +0200 + + Increase kernel map entry pool size + + * vm/vm_map.h (KENTRY_DATA_SIZE): Set to 256 pages. + +diff --git a/vm/vm_map.h b/vm/vm_map.h +index 5fdac4e..1caf9ae 100644 +--- a/vm/vm_map.h ++++ b/vm/vm_map.h +@@ -55,7 +55,7 @@ + #include <kern/macro_help.h> + + /* TODO: make it dynamic */ +-#define KENTRY_DATA_SIZE (64*PAGE_SIZE) ++#define KENTRY_DATA_SIZE (256*PAGE_SIZE) + + /* + * 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 (96 * 1024 * 1024) + + /* + * Shift for the first kalloc cache size. diff --git a/debian/patches/series b/debian/patches/series index 6b215aa..f20e857 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,5 +3,5 @@ 50_initrd.patch 60_bigmem.patch 70_dde.patch +git-kentry_data_size.patch protected_payload.patch - |