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

Commit 27c13ece authored by Borislav Petkov's avatar Borislav Petkov Committed by H. Peter Anvin
Browse files

x86, cpu: mv display_cacheinfo -> cpu_detect_cache_sizes 



display_cacheinfo() doesn't display anything anymore and it is used to
detect CPU cache sizes. Rename it accordingly.

Signed-off-by: default avatarBorislav Petkov <petkovbb@gmail.com>
LKML-Reference: <20091121130145.GA31357@liondog.tnic>
Signed-off-by: default avatarH. Peter Anvin <hpa@zytor.com>
parent 0e7810be

arch/x86/kernel/cpu/amd.c

+1 −1
Original line number Diff line number Diff line
@@ -535,7 +535,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) 
		}

	}



	display_cacheinfo(c);

	cpu_detect_cache_sizes(c);



	/* Multi core CPU? */

	if (c->extended_cpuid_level >= 0x80000008) {

arch/x86/kernel/cpu/centaur.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ static void __cpuinit init_c3(struct cpuinfo_x86 *c) 
		set_cpu_cap(c, X86_FEATURE_REP_GOOD);

	}



	display_cacheinfo(c);

	cpu_detect_cache_sizes(c);

}



enum {

arch/x86/kernel/cpu/common.c

+2 −2
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ void __init setup_cpu_local_masks(void) 
static void __cpuinit default_init(struct cpuinfo_x86 *c)

{

#ifdef CONFIG_X86_64

	display_cacheinfo(c);

	cpu_detect_cache_sizes(c);

#else

	/* Not much we can do here... */

	/* Check if at least it has cpuid */
@@ -383,7 +383,7 @@ static void __cpuinit get_model_name(struct cpuinfo_x86 *c) 
	}

}



void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)

void __cpuinit cpu_detect_cache_sizes(struct cpuinfo_x86 *c)

{

	unsigned int n, dummy, ebx, ecx, edx, l2size;

arch/x86/kernel/cpu/cpu.h

+1 −1
Original line number Diff line number Diff line
@@ -32,6 +32,6 @@ struct cpu_dev { 
extern const struct cpu_dev *const __x86_cpu_dev_start[],

			    *const __x86_cpu_dev_end[];



extern void display_cacheinfo(struct cpuinfo_x86 *c);

extern void cpu_detect_cache_sizes(struct cpuinfo_x86 *c);



#endif

arch/x86/kernel/cpu/cyrix.c

+1 −1
Original line number Diff line number Diff line
@@ -373,7 +373,7 @@ static void __cpuinit init_nsc(struct cpuinfo_x86 *c) 
	/* Handle the GX (Formally known as the GX2) */



	if (c->x86 == 5 && c->x86_model == 5)

		display_cacheinfo(c);

		cpu_detect_cache_sizes(c);

	else

		init_cyrix(c);

}