Merge "mm: slub: Declare slab_owner_ops only when SLUB DEBUG is enabled"

This commit is contained in:
qctecmdr 2024-01-21 20:36:18 -08:00 • committed by Gerrit - the friendly Code Review server
commit 4d067a9dad

View file

@ -6240,6 +6240,7 @@ static int sysfs_slab_alias(struct kmem_cache *s, const char *name)
return 0;
}
#ifdef CONFIG_SLUB_DEBUG
#ifdef CONFIG_QCOM_MINIDUMP_PANIC_DUMP
static ssize_t slab_owner_filter_write(struct file *file,
const char __user *ubuf,
@ -6321,7 +6322,8 @@ static const struct file_operations proc_slab_owner_handle_ops = {
.write = slab_owner_handle_write,
.read = slab_owner_handle_read,
};
#endif
#endif /* CONFIG_QCOM_MINIDUMP_PANIC_DUMP */
#endif /* CONFIG_SLUB_DEBUG */
static int __init slab_sysfs_init(void)
{
@ -6366,6 +6368,7 @@ static int __init slab_sysfs_init(void)
kfree(al);
}
#ifdef CONFIG_SLUB_DEBUG
#ifdef CONFIG_QCOM_MINIDUMP_PANIC_DUMP
if (slub_debug) {
int i;
@ -6380,6 +6383,7 @@ static int __init slab_sysfs_init(void)
set_bit(i, &slab_owner_filter);
}
}
#endif
#endif
mutex_unlock(&slab_mutex);
resiliency_test();