Skip to content

Commit 8f0293b

Browse files
committed
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.
2 parents 197b6b6 + 220a20a commit 8f0293b

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

include/linux/slab.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ void *kmalloc_large_node(size_t size, gfp_t flags, int node) __assume_page_align
526526
* to be at least to the size.
527527
*
528528
* The @flags argument may be one of the GFP flags defined at
529-
* include/linux/gfp.h and described at
529+
* include/linux/gfp_types.h and described at
530530
* :ref:`Documentation/core-api/mm-api.rst <mm-api-gfp-flags>`
531531
*
532532
* The recommended usage of the @flags is described at

mm/Kconfig.debug

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,9 +60,9 @@ config SLUB_DEBUG
6060
select STACKDEPOT if STACKTRACE_SUPPORT
6161
help
6262
SLUB has extensive debug support features. Disabling these can
63-
result in significant savings in code size. This also disables
64-
SLUB sysfs support. /sys/slab will not exist and there will be
65-
no support for cache validation etc.
63+
result in significant savings in code size. While /sys/kernel/slab
64+
will still exist (with SYSFS enabled), it will not provide e.g. cache
65+
validation.
6666

6767
config SLUB_DEBUG_ON
6868
bool "SLUB debugging on by default"

mm/slub.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6059,7 +6059,7 @@ static const struct sysfs_ops slab_sysfs_ops = {
60596059
.store = slab_attr_store,
60606060
};
60616061

6062-
static struct kobj_type slab_ktype = {
6062+
static const struct kobj_type slab_ktype = {
60636063
.sysfs_ops = &slab_sysfs_ops,
60646064
.release = kmem_cache_release,
60656065
};

0 commit comments

Comments
 (0)