summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authoralc <alc@FreeBSD.org>2003-07-26 21:48:46 +0000
committeralc <alc@FreeBSD.org>2003-07-26 21:48:46 +0000
commitd63c1dd2b8ad29c4418d3921da9c624fd1d64668 (patch)
tree74bd16b6d5626e7addb62eab7cac0e7a481c508e /sys
parent88c0fa436ad148675a3c832281e12e94f9d682ed (diff)
downloadFreeBSD-src-d63c1dd2b8ad29c4418d3921da9c624fd1d64668.zip
FreeBSD-src-d63c1dd2b8ad29c4418d3921da9c624fd1d64668.tar.gz
Acquire Giant rather than asserting it is held in contigmalloc(). This is
a prerequisite to removing further uses of Giant from UMA.
Diffstat (limited to 'sys')
-rw-r--r--sys/vm/vm_contig.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/sys/vm/vm_contig.c b/sys/vm/vm_contig.c
index 25d9a3a..f26a8d1 100644
--- a/sys/vm/vm_contig.c
+++ b/sys/vm/vm_contig.c
@@ -286,9 +286,10 @@ contigmalloc(
{
void * ret;
- GIANT_REQUIRED;
+ mtx_lock(&Giant);
ret = contigmalloc1(size, type, flags, low, high, alignment, boundary,
kernel_map);
+ mtx_unlock(&Giant);
return (ret);
}
OpenPOWER on IntegriCloud