diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-25 13:00:41 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2023-04-25 13:00:41 -0700 |
commit | 736b378b29d89c8c3567fa4b2e948be5568aebb8 (patch) | |
tree | 4a97f3b2f465725d0a0b2fa62c26e3eaca738697 /init | |
parent | 11704531dde45bc667a411e1c76de81d9f4481b8 (diff) | |
parent | ed4cdfbeb8735c36a2e31009866dfc2dfa26db3f (diff) | |
download | linux-736b378b29d89c8c3567fa4b2e948be5568aebb8.tar.gz linux-736b378b29d89c8c3567fa4b2e948be5568aebb8.tar.bz2 linux-736b378b29d89c8c3567fa4b2e948be5568aebb8.zip |
Merge tag 'slab-for-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab
Pull slab updates from Vlastimil Babka:
"The main change is naturally the SLOB removal. Since its deprecation
in 6.2 I've seen no complaints so hopefully SLUB_(TINY) works well for
everyone and we can proceed.
Besides the code cleanup, the main immediate benefit will be allowing
kfree() family of function to work on kmem_cache_alloc() objects,
which was incompatible with SLOB. This includes kfree_rcu() which had
no kmem_cache_free_rcu() counterpart yet and now it shouldn't be
necessary anymore.
Besides that, there are several small code and comment improvements
from Thomas, Thorsten and Vernon"
* tag 'slab-for-6.4' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab:
mm/slab: document kfree() as allowed for kmem_cache_alloc() objects
mm/slob: remove slob.c
mm/slab: remove CONFIG_SLOB code from slab common code
mm, pagemap: remove SLOB and SLQB from comments and documentation
mm, page_flags: remove PG_slob_free
mm/slob: remove CONFIG_SLOB
mm/slub: fix help comment of SLUB_DEBUG
mm: slub: make kobj_type structure constant
slab: Adjust comment after refactoring of gfp.h
Diffstat (limited to 'init')
-rw-r--r-- | init/Kconfig | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/init/Kconfig b/init/Kconfig index 04acc3f80538..c9ec6e8e4d5d 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -945,7 +945,7 @@ config MEMCG config MEMCG_KMEM bool - depends on MEMCG && !SLOB + depends on MEMCG default y config BLK_CGROUP |