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

Commit 2966c6a0 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

x86_64: Prevent doing anything from cache_remove_dev() when info setup failed. 



AK: Removed the unlikelies because gcc heuristics default to unlikely
AK: for test == NULL and for negative returns.

Cc: Venkatesh Pallipadi <venkatesh.pallipadi@intel.com>
Cc: Ashok Raj <ashok.raj@intel.com>
Cc: Akinobu Mita <akinobu.mita@gmail.com>
Signed-off-by: default avatarJan Beulich <jbeulich@novell.com>
Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 95b08679

arch/i386/kernel/cpu/intel_cacheinfo.c

+3 −1
Original line number Diff line number Diff line
@@ -515,7 +515,7 @@ static int __cpuinit detect_cache_attributes(unsigned int cpu) 


	cpuid4_info[cpu] = kzalloc(

	    sizeof(struct _cpuid4_info) * num_cache_leaves, GFP_KERNEL);

	if (unlikely(cpuid4_info[cpu] == NULL))

	if (cpuid4_info[cpu] == NULL)

		return -ENOMEM;



	oldmask = current->cpus_allowed;
@@ -748,6 +748,8 @@ static void __cpuinit cache_remove_dev(struct sys_device * sys_dev) 
	unsigned int cpu = sys_dev->id;

	unsigned long i;



	if (cpuid4_info[cpu] == NULL)

		return;

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

		cache_remove_shared_cpu_map(cpu, i);

		kobject_unregister(&(INDEX_KOBJECT_PTR(cpu,i)->kobj));