Merge tag 'mm-stable-2024-05-17-19-19' of git://git.kernel.org/pub/scm/linux/kernel...

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

diff --git a/mm/page_owner.c b/mm/page_owner.c
index 75c2330..0a448d7 100644 (file)
--- a/mm/page_owner.c
+++ b/mm/page_owner.c
@@ -170,7 +170,7 @@ static void add_stack_record_to_list(struct stack_record *stack_record,
 
        /* Filter gfp_mask the same way stackdepot does, for consistency */
        gfp_mask &= ~GFP_ZONEMASK;
-       gfp_mask &= (GFP_ATOMIC | GFP_KERNEL);
+       gfp_mask &= (GFP_ATOMIC | GFP_KERNEL | __GFP_NOLOCKDEP);
        gfp_mask |= __GFP_NOWARN;
 
        set_current_in_page_owner();
@@ -328,7 +328,7 @@ noinline void __set_page_owner(struct page *page, unsigned short order,
        if (unlikely(!page_ext))
                return;
        __update_page_owner_handle(page_ext, handle, order, gfp_mask, -1,
-                                  current->pid, current->tgid, ts_nsec,
+                                  ts_nsec, current->pid, current->tgid,
                                   current->comm);
        page_ext_put(page_ext);
        inc_stack_record_count(handle, gfp_mask, 1 << order);