summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <sthibault@debian.org>2007-10-02 10:44:20 +0000
committerSamuel Thibault <sthibault@debian.org>2007-10-02 10:44:20 +0000
commit38d6f140e48182e133c20927f7e0f1d288d6b031 (patch)
tree2b407215dd797dc1fd34c7c270e32023432a16f1
parentc8d07b23e1838396724cc18882f4a88ea8f60940 (diff)
* Fix zalloc alignment support, and thus alignment of FPU save area
(Closes: #440068) - debian/patches/patches/21_aligned_zalloc.patch
-rw-r--r--debian/changelog3
-rw-r--r--debian/patches/21_aligned_zalloc.patch21
-rw-r--r--debian/patches/series1
3 files changed, 25 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index a701b12..ef06a14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ gnumach (2:1.3.99.dfsg.cvs20070809-2) unstable; urgency=low
[ Samuel Thibault ]
* Append more agressive caching parameter to
debian/patches/14_alloc_params.patch.
+ * Fix zalloc alignment support, and thus alignment of FPU save area
+ (Closes: #440068)
+ - debian/patches/patches/21_aligned_zalloc.patch
-- Guillem Jover <guillem@debian.org> Thu, 09 Aug 2007 01:45:22 +0300
diff --git a/debian/patches/21_aligned_zalloc.patch b/debian/patches/21_aligned_zalloc.patch
new file mode 100644
index 0000000..b63f1c1
--- /dev/null
+++ b/debian/patches/21_aligned_zalloc.patch
@@ -0,0 +1,21 @@
+2007-09-03 Samuel Thibault <samuel.thibault@ens-lyon.org>
+
+ * kern/zalloc.c (zget_space): Align zalloc_next_space again after
+ calling kmem_alloc_wired (which may sleep).
+
+Index: kern/zalloc.c
+===================================================================
+RCS file: /cvsroot/hurd/gnumach/kern/zalloc.c,v
+retrieving revision 1.3.2.8
+diff -u -p -r1.3.2.8 zalloc.c
+--- kern/zalloc.c 30 Apr 2007 20:30:11 -0000 1.3.2.8
++++ kern/zalloc.c 3 Sep 2007 23:22:13 -0000
+@@ -320,6 +320,8 @@ static vm_offset_t zget_space(vm_offset_
+ zone_page_init(new_space, space_to_add,
+ ZONE_PAGE_USED);
+ simple_lock(&zget_space_lock);
++ if (align > 0)
++ ALIGN_SIZE_UP(zalloc_next_space, align);
+ continue;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index dfcd4e6..ebef1b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@
14_alloc_params.patch -p0
15_mem_obj_proxy.patch -p0
20_mmx_support.patch -p0
+21_aligned_zalloc.patch -p0
24_pci_irq_fix.patch -p1
40_iopl_mmap.patch -p0
90_autoconf_autogen.patch