lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

x86: remove duplicated get_model_name() calling

Browse Source 
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Yinghai Lu
2008-09-06 01:52:27 -07:00
committed by Ingo Molnar
parent deed05b7c0
commit 1b05d60d60
7 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
arch/x86/kernel/cpu/amd.c
View File

@@ -42,7 +42,6 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
{ {
u32 l, h; u32 l, h;
int mbytes = num_physpages >> (20-PAGE_SHIFT); int mbytes = num_physpages >> (20-PAGE_SHIFT);
int r;
#ifdef CONFIG_SMP #ifdef CONFIG_SMP
unsigned long long value; unsigned long long value;
@@ -75,8 +74,6 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
*/ */
clear_cpu_cap(c, 0*32+31); clear_cpu_cap(c, 0*32+31);
r = get_model_name(c);
switch (c->x86) { switch (c->x86) {
case 4: case 4:
/* /*

3
arch/x86/kernel/cpu/amd_64.c
View File

@@ -157,8 +157,7 @@ static void __cpuinit init_amd(struct cpuinfo_x86 *c)
if (c->x86 >= 6) if (c->x86 >= 6)
set_cpu_cap(c, X86_FEATURE_FXSAVE_LEAK); set_cpu_cap(c, X86_FEATURE_FXSAVE_LEAK);
level = get_model_name(c); if (!c->x86_model_id[0]) {
if (!level) {
switch (c->x86) { switch (c->x86) {
case 0xf: case 0xf:
/* Should distinguish Models here, but this is only /* Should distinguish Models here, but this is only

1
arch/x86/kernel/cpu/centaur.c
View File

@@ -289,7 +289,6 @@ static void __cpuinit init_c3(struct cpuinfo_x86 *c)
if (c->x86_model >= 6 && c->x86_model < 9) if (c->x86_model >= 6 && c->x86_model < 9)
set_cpu_cap(c, X86_FEATURE_3DNOW); set_cpu_cap(c, X86_FEATURE_3DNOW);
get_model_name(c);
display_cacheinfo(c); display_cacheinfo(c);
} }

9
arch/x86/kernel/cpu/common.c
View File

@@ -252,13 +252,13 @@ static struct cpu_dev __cpuinitdata default_cpu = {
.c_x86_vendor = X86_VENDOR_UNKNOWN, .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; unsigned int *v;
char *p, *q; char *p, *q;
if (c->extended_cpuid_level < 0x80000004) if (c->extended_cpuid_level < 0x80000004)
return 0; return;
v = (unsigned int *) c->x86_model_id; v = (unsigned int *) c->x86_model_id;
cpuid(0x80000002, &v[0], &v[1], &v[2], &v[3]); 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]) while (q <= &c->x86_model_id[48])
*q++ = '\0'; /* Zero-pad the rest */ *q++ = '\0'; /* Zero-pad the rest */
} }
return 1;
} }
void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c) void __cpuinit display_cacheinfo(struct cpuinfo_x86 *c)
@@ -610,8 +608,7 @@ static void __cpuinit generic_identify(struct cpuinfo_x86 *c)
#endif #endif
} }
if (c->extended_cpuid_level >= 0x80000004) get_model_name(c); /* Default name */
get_model_name(c); /* Default name */
init_scattered_cpuid_features(c); init_scattered_cpuid_features(c);
detect_nopl(c); detect_nopl(c);

1
arch/x86/kernel/cpu/cpu.h
View File

@@ -31,7 +31,6 @@ struct cpu_dev {
extern struct cpu_dev *__x86_cpu_dev_start[], *__x86_cpu_dev_end[]; 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); extern void display_cacheinfo(struct cpuinfo_x86 *c);
#endif #endif

1
arch/x86/kernel/cpu/cyrix.c
View File

@@ -301,7 +301,6 @@ static void __cpuinit init_cyrix(struct cpuinfo_x86 *c)
*/ */
if ((0x30 <= dir1 && dir1 <= 0x6f) || (0x80 <= dir1 && dir1 <= 0x8f)) if ((0x30 <= dir1 && dir1 <= 0x6f) || (0x80 <= dir1 && dir1 <= 0x8f))
geode_configure(); geode_configure();
get_model_name(c); /* get CPU marketing name */
return; return;
} else { /* MediaGX */ } else { /* MediaGX */
Cx86_cb[2] = (dir0_lsn & 1) ? '3' : '4'; Cx86_cb[2] = (dir0_lsn & 1) ? '3' : '4';

1
arch/x86/kernel/cpu/transmeta.c
View File

@@ -12,7 +12,6 @@ static void __cpuinit init_transmeta(struct cpuinfo_x86 *c)
unsigned int cpu_rev, cpu_freq = 0, cpu_flags, new_cpu_rev; unsigned int cpu_rev, cpu_freq = 0, cpu_flags, new_cpu_rev;
char cpu_info[65]; char cpu_info[65];
get_model_name(c); /* Same as AMD/Cyrix */
display_cacheinfo(c); display_cacheinfo(c);
/* Print CMS and CPU revision */ /* Print CMS and CPU revision */