Skip to content

Commit e492fac

Browse files
committed
Merge branch 'slab/for-6.14/kfree_rcu_move' into slab/for-next
Merge the slab feature branch for 6.14: - Move the kfree_rcu() implementation from RCU to SLAB subsystem (Uladzislau Rezki)
2 parents 2da76e9 + bbe658d commit e492fac

File tree

4 files changed

+882
-876
lines changed

4 files changed

+882
-876
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)