Merge tag 'mm-stable-2023-02-20-13-37' of git://git.kernel.org/pub/scm/linux/kernel...

[sfrench/cifs-2.6.git] / mm / slub.c

diff --git a/mm/slub.c b/mm/slub.c
index 1013834fb7bb6a7c2d23c3ede30a5a481fd521a1..39327e98fce347a7c7c4d55850d7850f8c468907 100644 (file)
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -1592,7 +1592,7 @@ static int __init setup_slub_debug(char *str)
                } else {
                        slab_list_specified = true;
                        if (flags & SLAB_STORE_USER)
-                               stack_depot_want_early_init();
+                               stack_depot_request_early_init();
                }
        }
 
@@ -1611,7 +1611,7 @@ static int __init setup_slub_debug(char *str)
 out:
        slub_debug = global_flags;
        if (slub_debug & SLAB_STORE_USER)
-               stack_depot_want_early_init();
+               stack_depot_request_early_init();
        if (slub_debug != 0 || slub_debug_string)
                static_branch_enable(&slub_debug_enabled);
        else
@@ -1859,7 +1859,7 @@ static inline struct slab *alloc_slab_page(gfp_t flags, int node,
        __folio_set_slab(folio);
        /* Make the flag visible before any changes to folio->mapping */
        smp_wmb();
-       if (page_is_pfmemalloc(folio_page(folio, 0)))
+       if (folio_is_pfmemalloc(folio))
                slab_set_pfmemalloc(slab);
 
        return slab;