summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/vm/uma_core.c8
1 files changed, 1 insertions, 7 deletions
diff --git a/sys/vm/uma_core.c b/sys/vm/uma_core.c
index d887f3c..c2c11f8 100644
--- a/sys/vm/uma_core.c
+++ b/sys/vm/uma_core.c
@@ -2038,13 +2038,7 @@ uma_large_malloc(int size, int wait)
if (slab == NULL)
return (NULL);
- /* XXX: kmem_malloc panics if Giant isn't held and sleep allowed */
- if ((wait & M_NOWAIT) == 0 && !mtx_owned(&Giant)) {
- mtx_lock(&Giant);
- mem = page_alloc(NULL, size, &flags, wait);
- mtx_unlock(&Giant);
- } else
- mem = page_alloc(NULL, size, &flags, wait);
+ mem = page_alloc(NULL, size, &flags, wait);
if (mem) {
vsetslab((vm_offset_t)mem, slab);
slab->us_data = mem;
OpenPOWER on IntegriCloud