From: Akinobu Mita By previous cpu hotplug notifier change, we don't need to track topology_dev existence for each cpu by topology_dev_map. Acked-by: Greg Kroah-Hartman Signed-off-by: Akinobu Mita Cc: Gautham R Shenoy Cc: Oleg Nesterov Signed-off-by: Andrew Morton --- drivers/base/topology.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff -puN drivers/base/topology.c~cpu-hotplug-topology-remove-topology_dev_map drivers/base/topology.c --- a/drivers/base/topology.c~cpu-hotplug-topology-remove-topology_dev_map +++ a/drivers/base/topology.c @@ -94,27 +94,18 @@ static struct attribute_group topology_a .name = "topology" }; -static cpumask_t topology_dev_map = CPU_MASK_NONE; - /* Add/Remove cpu_topology interface for CPU device */ static int __cpuinit topology_add_dev(unsigned int cpu) { - int rc; struct sys_device *sys_dev = get_cpu_sysdev(cpu); - rc = sysfs_create_group(&sys_dev->kobj, &topology_attr_group); - if (!rc) - cpu_set(cpu, topology_dev_map); - return rc; + return sysfs_create_group(&sys_dev->kobj, &topology_attr_group); } static void __cpuinit topology_remove_dev(unsigned int cpu) { struct sys_device *sys_dev = get_cpu_sysdev(cpu); - if (!cpu_isset(cpu, topology_dev_map)) - return; - cpu_clear(cpu, topology_dev_map); sysfs_remove_group(&sys_dev->kobj, &topology_attr_group); } _