Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'driver-core-4.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core
Pull driver core fix from Greg KH:
"Here is one driver core fix for 4.3-rc3 that resolves a reported oops"
* tag 'driver-core-4.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core:
cpu/cacheinfo: Fix teardown path
+8
-2
+8
-2
drivers/base/cacheinfo.c
+8
-2
drivers/base/cacheinfo.c
···
148
148
149
149
if (sibling == cpu) /* skip itself */
150
150
continue;
151
+
151
152
sib_cpu_ci = get_cpu_cacheinfo(sibling);
153
+
if (!sib_cpu_ci->info_list)
154
+
continue;
155
+
152
156
sib_leaf = sib_cpu_ci->info_list + index;
153
157
cpumask_clear_cpu(cpu, &sib_leaf->shared_cpu_map);
154
158
cpumask_clear_cpu(sibling, &this_leaf->shared_cpu_map);
···
163
159
164
160
static void free_cache_attributes(unsigned int cpu)
165
161
{
162
+
if (!per_cpu_cacheinfo(cpu))
163
+
return;
164
+
166
165
cache_shared_cpu_map_remove(cpu);
167
166
168
167
kfree(per_cpu_cacheinfo(cpu));
···
521
514
break;
522
515
case CPU_DEAD:
523
516
cache_remove_dev(cpu);
524
-
if (per_cpu_cacheinfo(cpu))
525
-
free_cache_attributes(cpu);
517
+
free_cache_attributes(cpu);
526
518
break;
527
519
}
528
520
return notifier_from_errno(rc);