diff options
| author | Bartosz Golaszewski <[email protected]> | 2024-11-04 07:46:55 +0000 |
|---|---|---|
| committer | Bartosz Golaszewski <[email protected]> | 2024-11-04 07:46:55 +0000 |
| commit | a7a86fe18b9a3c1e3f2c0b4687bf53cc2b9f9f88 (patch) | |
| tree | 3d0296da382dd92ab964719d981fa32ee383e886 /mm/page_alloc.c | |
| parent | gpio: mpsse: Check for error code from devm_mutex_init() call (diff) | |
| parent | Linux 6.12-rc6 (diff) | |
| download | kernel-a7a86fe18b9a3c1e3f2c0b4687bf53cc2b9f9f88.tar.gz kernel-a7a86fe18b9a3c1e3f2c0b4687bf53cc2b9f9f88.zip | |
Merge tag 'v6.12-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux into gpio/for-next
Linux 6.12-rc6
Diffstat (limited to 'mm/page_alloc.c')
| -rw-r--r-- | mm/page_alloc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mm/page_alloc.c b/mm/page_alloc.c index 8afab64814dc..94a2ffe28008 100644 --- a/mm/page_alloc.c +++ b/mm/page_alloc.c @@ -2893,12 +2893,12 @@ struct page *rmqueue_buddy(struct zone *preferred_zone, struct zone *zone, page = __rmqueue(zone, order, migratetype, alloc_flags); /* - * If the allocation fails, allow OOM handling access - * to HIGHATOMIC reserves as failing now is worse than - * failing a high-order atomic allocation in the - * future. + * If the allocation fails, allow OOM handling and + * order-0 (atomic) allocs access to HIGHATOMIC + * reserves as failing now is worse than failing a + * high-order atomic allocation in the future. */ - if (!page && (alloc_flags & ALLOC_OOM)) + if (!page && (alloc_flags & (ALLOC_OOM|ALLOC_NON_BLOCK))) page = __rmqueue_smallest(zone, order, MIGRATE_HIGHATOMIC); if (!page) { |