Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 542eb75a authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Kobject: change arch/x86/kernel/cpu/mcheck/mce_amd_64.c to use kobject_init_and_add 



Stop using kobject_register, as this way we can control the sending of
the uevent properly, after everything is properly initialized.

Cc: Jacob Shin <jacob.shin@amd.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent a521cf20

arch/x86/kernel/cpu/mcheck/mce_amd_64.c

+5 −4
Original line number Diff line number Diff line
@@ -432,10 +432,9 @@ static __cpuinit int allocate_threshold_blocks(unsigned int cpu, 
	else

		per_cpu(threshold_banks, cpu)[bank]->blocks = b;



	kobject_set_name(&b->kobj, "misc%i", block);

	b->kobj.parent = per_cpu(threshold_banks, cpu)[bank]->kobj;

	b->kobj.ktype = &threshold_ktype;

	err = kobject_register(&b->kobj);

	err = kobject_init_and_add(&b->kobj, &threshold_ktype,

				   per_cpu(threshold_banks, cpu)[bank]->kobj,

				   "misc%i", block);

	if (err)

		goto out_free;

recurse:
@@ -451,6 +450,8 @@ static __cpuinit int allocate_threshold_blocks(unsigned int cpu, 
	if (err)

		goto out_free;



	kobject_uevent(&b->kobj, KOBJ_ADD);



	return err;



out_free: