diff options
| author | Andrew Morton <akpm@linux-foundation.org> | 2025-07-12 14:48:26 -0700 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2025-07-12 14:48:26 -0700 |
| commit | cac3d177c045d1ff88ce4b64859c13de133564ed (patch) | |
| tree | e0e98021ddb23607f586787799ebf5d048203f3e /lib | |
| parent | fdc3bc3497946c6b416a17628907581657102e60 (diff) | |
| parent | db6cc3f4ac2e6cdc898fc9cbc8b32ae1bf56bdad (diff) | |
| download | linux-next-cac3d177c045d1ff88ce4b64859c13de133564ed.tar.gz linux-next-cac3d177c045d1ff88ce4b64859c13de133564ed.zip | |
Merge branch 'mm-hotfixes-stable' into mm-stable to pick up changes which
are required for a merge of the series "mm: folio_pte_batch()
improvements".
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/alloc_tag.c | 3 | ||||
| -rw-r--r-- | lib/maple_tree.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/lib/alloc_tag.c b/lib/alloc_tag.c index 41ccfb035b7b..e9b33848700a 100644 --- a/lib/alloc_tag.c +++ b/lib/alloc_tag.c @@ -127,6 +127,9 @@ size_t alloc_tag_top_users(struct codetag_bytes *tags, size_t count, bool can_sl struct codetag_bytes n; unsigned int i, nr = 0; + if (IS_ERR_OR_NULL(alloc_tag_cttype)) + return 0; + if (can_sleep) codetag_lock_module_list(alloc_tag_cttype, true); else if (!codetag_trylock_module_list(alloc_tag_cttype)) diff --git a/lib/maple_tree.c b/lib/maple_tree.c index 7601c7c2bc09..0e85e92c5375 100644 --- a/lib/maple_tree.c +++ b/lib/maple_tree.c @@ -5316,6 +5316,7 @@ static void mt_destroy_walk(struct maple_enode *enode, struct maple_tree *mt, struct maple_enode *start; if (mte_is_leaf(enode)) { + mte_set_node_dead(enode); node->type = mte_node_type(enode); goto free_leaf; } |