Commit 1b05d60d authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

x86: remove duplicated get_model_name() calling 



Signed-off-by: default avatarYinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent deed05b7

arch/x86/kernel/cpu/amd.c

+0 −3
Original line number Diff line number Diff line
@@ -42,7 +42,6 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) 
{

	u32 l, h;

	int mbytes = num_physpages >> (20-PAGE_SHIFT);

	int r;



#ifdef CONFIG_SMP

	unsigned long long value;
@@ -75,8 +74,6 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) 
	 */

	clear_cpu_cap(c, 0*32+31);



	r = get_model_name(c);



	switch (c->x86) {

	case 4:

		/*

arch/x86/kernel/cpu/amd_64.c

+1 −2
Original line number Diff line number Diff line
@@ -157,8 +157,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c) 
	if (c->x86 >= 6)

		set_cpu_cap(c, X86_FEATURE_FXSAVE_LEAK);



	level = get_model_name(c);

	if (!level) {

	if (!c->x86_model_id[0]) {

		switch (c->x86) {

		case 0xf:

			/* Should distinguish Models here, but this is only

arch/x86/kernel/cpu/centaur.c

+0 −1
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ static void __cpuinit init_c3(struct cpuinfo_x86 *c) 
	if (c->x86_model >= 6 && c->x86_model < 9)

		set_cpu_cap(c, X86_FEATURE_3DNOW);



	get_model_name(c);

	display_cacheinfo(c);

}

arch/x86/kernel/cpu/common.c

+3 −6
Original line number Diff line number Diff line
@@ -252,13 +252,13 @@ static struct cpu_dev __cpuinitdata default_cpu = { 
	.c_x86_vendor = X86_VENDOR_UNKNOWN,

};



int __cpuinit get_model_name(struct cpuinfo_x86 *c)

static void __cpuinit get_model_name(struct cpuinfo_x86 *c)

{

	unsigned int *v;

	char *p, *q;



	if (c->extended_cpuid_level < 0x80000004)

		return 0;

		return;



	v = (unsigned int *) c->x86_model_id;

	cpuid(0x80000002, &v[0], &v[1], &v[2], &v[3]);
@@ -277,8 +277,6 @@ int __cpuinit get_model_name(struct cpuinfo_x86 *c) 
	     while (q <= &c->x86_model_id[48])

		  *q++ = '\0';	/* Zero-pad the rest */

	}



	return 1;

}



void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)
@@ -610,7 +608,6 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c) 
#endif

	}



	if (c->extended_cpuid_level >= 0x80000004)

	get_model_name(c); /* Default name */



	init_scattered_cpuid_features(c);

arch/x86/kernel/cpu/cpu.h

+0 −1
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ struct cpu_dev { 


extern struct cpu_dev *__x86_cpu_dev_start[], *__x86_cpu_dev_end[];



extern int get_model_name(struct cpuinfo_x86 *c);

extern void display_cacheinfo(struct cpuinfo_x86 *c);



#endif