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

Commit 5b3f355d authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

Kobject: change arch/x86/kernel/cpu/intel_cacheinfo.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: Ashok Raj <ashok.raj@intel.com>
Cc: Kay Sievers <kay.sievers@vrfy.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 61030bfb

arch/x86/kernel/cpu/intel_cacheinfo.c

+7 −8
Original line number Diff line number Diff line
@@ -733,10 +733,8 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) 
	if (unlikely(retval < 0))

		return retval;



	cache_kobject[cpu]->parent = &sys_dev->kobj;

	kobject_set_name(cache_kobject[cpu], "%s", "cache");

	cache_kobject[cpu]->ktype = &ktype_percpu_entry;

	retval = kobject_register(cache_kobject[cpu]);

	retval = kobject_init_and_add(cache_kobject[cpu], &ktype_percpu_entry,

				      &sys_dev->kobj, "%s", "cache");

	if (retval < 0) {

		cpuid4_cache_sysfs_exit(cpu);

		return retval;
@@ -746,10 +744,9 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) 
		this_object = INDEX_KOBJECT_PTR(cpu,i);

		this_object->cpu = cpu;

		this_object->index = i;

		this_object->kobj.parent = cache_kobject[cpu];

		kobject_set_name(&(this_object->kobj), "index%1lu", i);

		this_object->kobj.ktype = &ktype_cache;

		retval = kobject_register(&(this_object->kobj));

		retval = kobject_init_and_add(&(this_object->kobj),

					      &ktype_cache, cache_kobject[cpu],

					      "index%1lu", i);

		if (unlikely(retval)) {

			for (j = 0; j < i; j++) {

				kobject_unregister(
@@ -759,10 +756,12 @@ static int __cpuinit cache_add_dev(struct sys_device * sys_dev) 
			cpuid4_cache_sysfs_exit(cpu);

			break;

		}

		kobject_uevent(&(this_object->kobj), KOBJ_ADD);

	}

	if (!retval)

		cpu_set(cpu, cache_dev_map);



	kobject_uevent(cache_kobject[cpu], KOBJ_ADD);

	return retval;

}