diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-22 17:32:04 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2024-05-22 17:32:04 -0700 |
| commit | 5c6f4d68e2aca67e425b7227369ec9fde8adfb6d (patch) | |
| tree | b60f38675b4572047bcb840a89cb07329a5f6c22 /lib | |
| parent | de7e71ef8bed222dd144d8878091ecb6d5dfd208 (diff) | |
| parent | 99b80ac45f7ec351c2d1c9fbfec702213dcae566 (diff) | |
Merge tag 'mm-stable-2024-05-22-17-22' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
Pull more mm updates from Andrew Morton:
"A series from Dave Chinner which cleans up and fixes the handling of
nested allocations within stackdepot and page-owner"
* tag 'mm-stable-2024-05-22-17-22' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm:
mm/page-owner: use gfp_nested_mask() instead of open coded masking
stackdepot: use gfp_nested_mask() instead of open coded masking
mm: lift gfp_kmemleak_mask() to gfp.h
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/stackdepot.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/lib/stackdepot.c b/lib/stackdepot.c index cd8f23455285..5ed34cc963fc 100644 --- a/lib/stackdepot.c +++ b/lib/stackdepot.c @@ -624,15 +624,8 @@ depot_stack_handle_t stack_depot_save_flags(unsigned long *entries, * we won't be able to do that under the lock. */ if (unlikely(can_alloc && !READ_ONCE(new_pool))) { - /* - * Zero out zone modifiers, as we don't have specific zone - * requirements. Keep the flags related to allocation in atomic - * contexts, I/O, nolockdep. - */ - alloc_flags &= ~GFP_ZONEMASK; - alloc_flags &= (GFP_ATOMIC | GFP_KERNEL | __GFP_NOLOCKDEP); - alloc_flags |= __GFP_NOWARN; - page = alloc_pages(alloc_flags, DEPOT_POOL_ORDER); + page = alloc_pages(gfp_nested_mask(alloc_flags), + DEPOT_POOL_ORDER); if (page) prealloc = page_address(page); } |