2 files changed, 5 insertions, 6 deletions

diff --git a/lib/bucket_locks.c b/lib/bucket_locks.c
index 266a97c5708b..ade3ce6c4af6 100644
--- a/lib/bucket_locks.c
+++ b/lib/bucket_locks.c
@@ -30,10 +30,7 @@ int alloc_bucket_spinlocks(spinlock_t **locks, unsigned int *locks_mask,
         }
 
         if (sizeof(spinlock_t) != 0) {
-                if (gfpflags_allow_blocking(gfp))
-                        tlocks = kvmalloc(size * sizeof(spinlock_t), gfp);
-                else
-                        tlocks = kmalloc_array(size, sizeof(spinlock_t), gfp);
+                tlocks = kvmalloc_array(size, sizeof(spinlock_t), gfp);
                 if (!tlocks)
                         return -ENOMEM;
                 for (i = 0; i < size; i++)
diff --git a/mm/util.c b/mm/util.c
index c2d0a7cdb189..3351659200e6 100644
--- a/mm/util.c
+++ b/mm/util.c
@@ -391,7 +391,8 @@ EXPORT_SYMBOL(vm_mmap);
  * __GFP_RETRY_MAYFAIL is supported, and it should be used only if kmalloc is
  * preferable to the vmalloc fallback, due to visible performance drawbacks.
  *
- * Any use of gfp flags outside of GFP_KERNEL should be consulted with mm people.
+ * Please note that any use of gfp flags outside of GFP_KERNEL is careful to not
+ * fall back to vmalloc.
  */
 void *kvmalloc_node(size_t size, gfp_t flags, int node)
 {
@@ -402,7 +403,8 @@ void *kvmalloc_node(size_t size, gfp_t flags, int node)
          * vmalloc uses GFP_KERNEL for some internal allocations (e.g page tables)
          * so the given set of flags has to be compatible.
          */
-        WARN_ON_ONCE((flags & GFP_KERNEL) != GFP_KERNEL);
+        if ((flags & GFP_KERNEL) != GFP_KERNEL)
+                return kmalloc_node(size, flags, node);
 
         /*
          * We want to attempt a large physically contiguous block first because