Skip to content

Commit ad37df3

Browse files
committed
Merge tag 'slab-for-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab
Pull slab updates from Vlastimil Babka: - Move the kfree_rcu() implementation from RCU to SLAB subsystem (Uladzislau Rezki) The kfree_rcu() implementation has been historically maintained in the RCU subsystem. At LSF/MM we agreed to move it to SLAB, where it more logically belongs. The batching is planned be more integrated with SLUB internals in the future, while using the RCU APIs like any other subsystem. - Fix for kernel-doc warning (Randy Dunlap) * tag 'slab-for-6.14' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab: mm/slab: fix kernel-doc func param names mm/slab: Move kvfree_rcu() into SLAB rcu/kvfree: Adjust a shrinker name rcu/kvfree: Adjust names passed into trace functions rcu/kvfree: Move some functions under CONFIG_TINY_RCU rcu/kvfree: Initialize kvfree_rcu() separately
2 parents 4c55116 + e492fac commit ad37df3

File tree

5 files changed

+884
-878
lines changed

5 files changed

+884
-878
lines changed

include/linux/slab.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1099,5 +1099,6 @@ unsigned int kmem_cache_size(struct kmem_cache *s);
10991099
size_t kmalloc_size_roundup(size_t size);
11001100

11011101
void __init kmem_cache_init_late(void);
1102+
void __init kvfree_rcu_init(void);
11021103

11031104
#endif /* _LINUX_SLAB_H */

init/main.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -992,6 +992,7 @@ void start_kernel(void)
992992
workqueue_init_early();
993993

994994
rcu_init();
995+
kvfree_rcu_init();
995996

996997
/* Trace events are available after this */
997998
trace_init();

0 commit comments

Comments
 (0)