summaryrefslogtreecommitdiff
path: root/mm
diff options
context:
space:
mode:
authorVlastimil Babka <vbabka@suse.cz>2023-03-29 11:45:38 +0300
committerVlastimil Babka <vbabka@suse.cz>2023-03-29 11:45:38 +0300
commit8f0293bf7aeb9339f724e306e7a0a741f633c738 (patch)
tree262a3491a926554430e73e962642ba783155ecbb /mm
parent197b6b60ae7bc51dd0814953c562833143b292aa (diff)
parent220a20ad140296243b621642ec3d0c46869efd02 (diff)
downloadlinux-8f0293bf7aeb9339f724e306e7a0a741f633c738.tar.xz
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.
Diffstat (limited to 'mm')
-rw-r--r--mm/Kconfig.debug6
-rw-r--r--mm/slub.c2
2 files changed, 4 insertions, 4 deletions
diff --git a/mm/Kconfig.debug b/mm/Kconfig.debug
index c3547a373c9c..59c83ad976f7 100644
--- a/mm/Kconfig.debug
+++ b/mm/Kconfig.debug
@@ -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"
diff --git a/mm/slub.c b/mm/slub.c
index 39327e98fce3..28ca576d988d 100644
--- a/mm/slub.c
+++ b/mm/slub.c
@@ -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,
};