niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

x86/CPU/AMD: Use default_groups in kobj_type

Browse source 
There are currently 2 ways to create a set of sysfs files for a
kobj_type, through the default_attrs field, and the default_groups
field. Move the AMD mce sysfs code to use default_groups field which has
been the preferred way since

  aa30f47cf6 ("kobject: Add support for default attribute groups to kobj_type")

so that the obsolete default_attrs field can be removed soon.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Borislav Petkov <bp@suse.de>
Tested-by: Yazen Ghannam <yazen.ghannam@amd.com>
Link: https://lore.kernel.org/r/20220106103537.3663852-1-gregkh@linuxfoundation.org
This commit is contained in:
Greg Kroah-Hartman 2022-01-06 11:35:37 +01:00 • committed by Borislav Petkov
parent 26291c54e1
commit 7f99cb5e60
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
arch/x86/kernel/cpu/mce/amd.c
View file

@ -993,6 +993,7 @@ static struct attribute *default_attrs[] = {
NULL, /* possibly interrupt_enable if supported, see below */ NULL, /* possibly interrupt_enable if supported, see below */
NULL, NULL,
}; };
ATTRIBUTE_GROUPS(default);
#define to_block(k) container_of(k, struct threshold_block, kobj) #define to_block(k) container_of(k, struct threshold_block, kobj)
#define to_attr(a) container_of(a, struct threshold_attr, attr) #define to_attr(a) container_of(a, struct threshold_attr, attr)
@ -1029,7 +1030,7 @@ static void threshold_block_release(struct kobject *kobj);
static struct kobj_type threshold_ktype = { static struct kobj_type threshold_ktype = {
.sysfs_ops = &threshold_ops, .sysfs_ops = &threshold_ops,
.default_attrs = default_attrs, .default_groups = default_groups,
.release = threshold_block_release, .release = threshold_block_release,
}; };
@ -1101,10 +1102,10 @@ static int allocate_threshold_blocks(unsigned int cpu, struct threshold_bank *tb
b->threshold_limit = THRESHOLD_MAX; b->threshold_limit = THRESHOLD_MAX;
if (b->interrupt_capable) { if (b->interrupt_capable) {
threshold_ktype.default_attrs[2] = &interrupt_enable.attr; default_attrs[2] = &interrupt_enable.attr;
b->interrupt_enable = 1; b->interrupt_enable = 1;
} else { } else {
threshold_ktype.default_attrs[2] = NULL; default_attrs[2] = NULL;
} }
INIT_LIST_HEAD(&b->miscj); INIT_LIST_HEAD(&b->miscj);