summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2013-06-04 19:55:13 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2013-06-04 19:55:13 +0200
commit1a036087f57956b604e3f47e1b7c535391fe36f3 (patch)
tree0c3c6af8bb1edbd0b125aa56ad3f2ffadc936542
parent21fff41626efc52861648edfe00c6ceecaa3a59c (diff)
parentb67a79a13ae2a42ed4a64bfd2bd3b4982cfdefca (diff)
Merge branch 'master' of git.savannah.gnu.org:/srv/git/hurd/gnumach
-rw-r--r--kern/slab.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/kern/slab.c b/kern/slab.c
index d14d07a..56fadbf 100644
--- a/kern/slab.c
+++ b/kern/slab.c
@@ -1229,6 +1229,7 @@ fast_free:
simple_unlock(&cpu_pool->lock);
kmem_cache_free(cache->cpu_pool_type->array_cache,
(vm_offset_t)array);
+ simple_lock(&cpu_pool->lock);
goto fast_free;
}