Merge branch 'mm-hotfixes-stable' into mm-stable in order to merge

"mm/huge_memory: only get folio_order() once during __folio_split()" into
mm-stable.
This commit is contained in:
Andrew Morton
2025-11-24 15:07:34 -08:00
8 changed files with 63 additions and 36 deletions

View File

@@ -2023,10 +2023,8 @@ swp_entry_t get_swap_page_of_type(int type)
local_lock(&percpu_swap_cluster.lock);
offset = cluster_alloc_swap_entry(si, 0, 1);
local_unlock(&percpu_swap_cluster.lock);
if (offset) {
if (offset)
entry = swp_entry(si->type, offset);
atomic_long_dec(&nr_swap_pages);
}
}
put_swap_device(si);
}