Commit 8f0293bf authored by Vlastimil Babka's avatar Vlastimil Babka
Browse files

Merge branch 'slab/for-6.4/trivial' into slab/for-next 

Trivial slab and slub fixes for 6.4. A comment fix, a structure
constification, and a config SLUB_DEBUG help text fix.
parents 197b6b60 220a20ad

include/linux/slab.h

+1 −1
Original line number Diff line number Diff line
@@ -526,7 +526,7 @@ void *kmalloc_large_node(size_t size, gfp_t flags, int node) __assume_page_align 
 * to be at least to the size.

 *

 * The @flags argument may be one of the GFP flags defined at

 * include/linux/gfp.h and described at

 * include/linux/gfp_types.h and described at

 * :ref:`Documentation/core-api/mm-api.rst <mm-api-gfp-flags>`

 *

 * The recommended usage of the @flags is described at

mm/Kconfig.debug

+3 −3
Original line number Diff line number Diff line
@@ -60,9 +60,9 @@ config SLUB_DEBUG 
	select STACKDEPOT if STACKTRACE_SUPPORT

	help

	  SLUB has extensive debug support features. Disabling these can

	  result in significant savings in code size. This also disables

	  SLUB sysfs support. /sys/slab will not exist and there will be

	  no support for cache validation etc.

	  result in significant savings in code size. While /sys/kernel/slab

	  will still exist (with SYSFS enabled), it will not provide e.g. cache

	  validation.



config SLUB_DEBUG_ON

	bool "SLUB debugging on by default"

mm/slub.c

+1 −1
Original line number Diff line number Diff line
@@ -6059,7 +6059,7 @@ static const struct sysfs_ops slab_sysfs_ops = { 
	.store = slab_attr_store,

};



static struct kobj_type slab_ktype = {

static const struct kobj_type slab_ktype = {

	.sysfs_ops = &slab_sysfs_ops,

	.release = kmem_cache_release,

};