summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--kern/zalloc.c1
2 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d2c0733..7c1e63f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+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).
+
2007-08-16 Samuel Thibault <samuel.thibault@ens-lyon.org>
* Makefile.am (clib_routines): Add udivdi3, __udivdi3 and _end. Fix
diff --git a/kern/zalloc.c b/kern/zalloc.c
index 126937e..54a3ffe 100644
--- a/kern/zalloc.c
+++ b/kern/zalloc.c
@@ -320,6 +320,7 @@ static vm_offset_t zget_space(vm_offset_t size, vm_size_t align)
zone_page_init(new_space, space_to_add,
ZONE_PAGE_USED);
simple_lock(&zget_space_lock);
+ ALIGN_SIZE_UP(zalloc_next_space, align);
continue;
}