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

Commit 7c1efeae authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 64b796e2 2110d70c

drivers/base/cacheinfo.c

+8 −2
Original line number Original line Diff line number Diff line
@@ -148,7 +148,11 @@ static void cache_shared_cpu_map_remove(unsigned int cpu) 




			if (sibling == cpu) /* skip itself */

			if (sibling == cpu) /* skip itself */

				continue;

				continue;



			sib_cpu_ci = get_cpu_cacheinfo(sibling);

			sib_cpu_ci = get_cpu_cacheinfo(sibling);

			if (!sib_cpu_ci->info_list)

				continue;



			sib_leaf = sib_cpu_ci->info_list + index;

			sib_leaf = sib_cpu_ci->info_list + index;

			cpumask_clear_cpu(cpu, &sib_leaf->shared_cpu_map);

			cpumask_clear_cpu(cpu, &sib_leaf->shared_cpu_map);

			cpumask_clear_cpu(sibling, &this_leaf->shared_cpu_map);

			cpumask_clear_cpu(sibling, &this_leaf->shared_cpu_map);
@@ -159,6 +163,9 @@ static void cache_shared_cpu_map_remove(unsigned int cpu) 




static void free_cache_attributes(unsigned int cpu)

static void free_cache_attributes(unsigned int cpu)

{

{

	if (!per_cpu_cacheinfo(cpu))

		return;



	cache_shared_cpu_map_remove(cpu);

	cache_shared_cpu_map_remove(cpu);





	kfree(per_cpu_cacheinfo(cpu));

	kfree(per_cpu_cacheinfo(cpu));
@@ -514,7 +521,6 @@ static int cacheinfo_cpu_callback(struct notifier_block *nfb, 
		break;

		break;

	case CPU_DEAD:

	case CPU_DEAD:

		cache_remove_dev(cpu);

		cache_remove_dev(cpu);

		if (per_cpu_cacheinfo(cpu))

		free_cache_attributes(cpu);

		free_cache_attributes(cpu);

		break;

		break;

	}

	}