system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-10-25 04:37:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

x86: cpu/common.c, merge default_init()

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-04 20:09:06 -07:00 committed by Ingo Molnar
parent fab334c1d5
commit b9e67f0042
2 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
arch/x86/kernel/cpu/common.c
View file

@ -224,6 +224,9 @@ static struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {};
static void __cpuinit default_init(struct cpuinfo_x86 *c) static void __cpuinit default_init(struct cpuinfo_x86 *c)
{ {
#ifdef CONFIG_X86_64
display_cacheinfo(c);
#else
/* Not much we can do here... */ /* Not much we can do here... */
/* Check if at least it has cpuid */ /* Check if at least it has cpuid */
if (c->cpuid_level == -1) { if (c->cpuid_level == -1) {
@ -233,6 +236,7 @@ static void __cpuinit default_init(struct cpuinfo_x86 *c)
else if (c->x86 == 3) else if (c->x86 == 3)
strcpy(c->x86_model_id, "386"); strcpy(c->x86_model_id, "386");
} }
#endif
} }
static struct cpu_dev __cpuinitdata default_cpu = { static struct cpu_dev __cpuinitdata default_cpu = {

12
arch/x86/kernel/cpu/common_64.c
View file

@ -223,7 +223,19 @@ static struct cpu_dev *cpu_devs[X86_VENDOR_NUM] = {};
static void __cpuinit default_init(struct cpuinfo_x86 *c) static void __cpuinit default_init(struct cpuinfo_x86 *c)
{ {
#ifdef CONFIG_X86_64
display_cacheinfo(c); display_cacheinfo(c);
#else
/* Not much we can do here... */
/* Check if at least it has cpuid */
if (c->cpuid_level == -1) {
/* No cpuid. It must be an ancient CPU */
if (c->x86 == 4)
strcpy(c->x86_model_id, "486");
else if (c->x86 == 3)
strcpy(c->x86_model_id, "386");
}
#endif
} }
static struct cpu_dev __cpuinitdata default_cpu = { static struct cpu_dev __cpuinitdata default_cpu = {