mirror of
https://github.com/torvalds/linux
synced 2024-10-25 04:37:40 +00:00
x86: cpu/common.c, merge default_init()
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com> Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
parent
fab334c1d5
commit
b9e67f0042
|
@ -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 = {
|
||||||
|
|
|
@ -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 = {
|
||||||
|
|
Loading…
Reference in a new issue