diff options
| author | Brian Behlendorf <[email protected]> | 2012-08-18 11:01:22 -0700 |
|---|---|---|
| committer | Brian Behlendorf <[email protected]> | 2012-08-27 12:00:55 -0700 |
| commit | bc03e07a7c43b134c7936bba5e87fb8a526b6692 (patch) | |
| tree | 9ba0edf655073ad82a4841c9770403021f682aef /module/spl | |
| parent | d47e664ad4b7468c43a97aa6d299d8756571155d (diff) | |
Revert "Detect kernels that honor gfp flags passed to vmalloc()"
This reverts commit 36811b4430aaea8c8b91bbe7d812a26799865499.
Which is no longer required because there is now SPL code in
place to safely handle the deadlocks the kernel patch was designed
to address. Therefore we can unconditionally use vmalloc() and
drop all the PF_MEMALLOC code.
Signed-off-by: Brian Behlendorf <[email protected]>
Diffstat (limited to 'module/spl')
| -rw-r--r-- | module/spl/spl-kmem.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/module/spl/spl-kmem.c b/module/spl/spl-kmem.c index 4cf3b26ad..2d5f751b0 100644 --- a/module/spl/spl-kmem.c +++ b/module/spl/spl-kmem.c @@ -843,9 +843,6 @@ kv_alloc(spl_kmem_cache_t *skc, int size, int flags) if (skc->skc_flags & KMC_KMEM) { ptr = (void *)__get_free_pages(flags, get_order(size)); } else { -#ifdef HAVE_PMD_ALLOC_WITH_MASK - ptr = __vmalloc(size, flags|__GFP_HIGHMEM, PAGE_KERNEL); -#else /* * As part of vmalloc() an __pte_alloc_kernel() allocation * may occur. This internal allocation does not honor the @@ -869,7 +866,6 @@ kv_alloc(spl_kmem_cache_t *skc, int size, int flags) } else { ptr = __vmalloc(size, flags|__GFP_HIGHMEM, PAGE_KERNEL); } -#endif } /* Resulting allocated memory will be page aligned */ |