Skip to content

Commit

Permalink
Merge branch 'slab/for-6.14/kfree_rcu_move' into slab/for-next
Browse files Browse the repository at this point in the history
Merge the slab feature branch for 6.14:

- Move the kfree_rcu() implementation from RCU to SLAB subsystem
  (Uladzislau Rezki)
  • Loading branch information
Vlastimil Babka committed Jan 17, 2025
2 parents 2da76e9 + bbe658d commit e492fac
Show file tree
Hide file tree
Showing 4 changed files with 882 additions and 876 deletions.
1 change: 1 addition & 0 deletions include/linux/slab.h
Original file line number Diff line number Diff line change
Expand Up @@ -1099,5 +1099,6 @@ unsigned int kmem_cache_size(struct kmem_cache *s);
size_t kmalloc_size_roundup(size_t size);

void __init kmem_cache_init_late(void);
void __init kvfree_rcu_init(void);

#endif /* _LINUX_SLAB_H */
1 change: 1 addition & 0 deletions init/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -992,6 +992,7 @@ void start_kernel(void)
workqueue_init_early();

rcu_init();
kvfree_rcu_init();

/* Trace events are available after this */
trace_init();
Expand Down
Loading

0 comments on commit e492fac

Please sign in to comment.