Merge tag 'fallthrough-fixes-clang-5.11-rc1' of git://git.kernel.org/pub/scm/linux...

[linux-2.6-microblaze.git] / mm / slob.c

diff --git a/mm/slob.c b/mm/slob.c
index 7cc9805..8d4bfa4 100644 (file)
--- a/mm/slob.c
+++ b/mm/slob.c
@@ -474,8 +474,7 @@ __do_kmalloc_node(size_t size, gfp_t gfp, int node, unsigned long caller)
 
        gfp &= gfp_allowed_mask;
 
-       fs_reclaim_acquire(gfp);
-       fs_reclaim_release(gfp);
+       might_alloc(gfp);
 
        if (size < PAGE_SIZE - minalign) {
                int align = minalign;
@@ -597,8 +596,7 @@ static void *slob_alloc_node(struct kmem_cache *c, gfp_t flags, int node)
 
        flags &= gfp_allowed_mask;
 
-       fs_reclaim_acquire(flags);
-       fs_reclaim_release(flags);
+       might_alloc(flags);
 
        if (c->size < PAGE_SIZE) {
                b = slob_alloc(c->size, flags, c->align, node, 0);