2008-01-18 09:00:32

by Yinghai Lu

Subject: [PATCH] x86_64: only call early_init_amd one time

[PATCH] x86_64: only call early_init_amd one time

Andi's patch
"
x86: move X86_FEATURE_CONSTANT_TSC into early cpu feature detection

Need this in the next patch in time_init and that happens early.

This includes a minor fix on i386 where early_intel_workarounds()
[which is now called early_init_intel] really executes early as
the comments say.
"
calling early_init_amd in early_identify_cpu and identify_cpu two times.

this patch remove the one in identify_cpu

Signed-off-by: Yinghai Lu <[email protected]>

diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c
index aeaa17d..d236593 100644
--- a/arch/x86/kernel/setup_64.c
+++ b/arch/x86/kernel/setup_64.c
@@ -1029,6 +1029,9 @@ static void __cpuinit early_identify_cpu(struct cpuinfo_x86 *c)
case X86_VENDOR_AMD:
early_init_amd(c);
break;
+ case X86_VENDOR_INTEL:
+ early_init_intel(c);
+ break;
}

}
@@ -1095,14 +1098,6 @@ void __cpuinit identify_cpu(struct cpuinfo_x86 *c)
numa_add_cpu(smp_processor_id());
#endif

- switch (c->x86_vendor) {
- case X86_VENDOR_AMD:
- early_init_amd(c);
- break;
- case X86_VENDOR_INTEL:
- early_init_intel(c);
- break;
- }
}

void __cpuinit print_cpu_info(struct cpuinfo_x86 *c)

2008-01-18 12:05:15

by Ingo Molnar

Subject: Re: [PATCH] x86_64: only call early_init_amd one time

* Yinghai Lu <[email protected]> wrote:

> [PATCH] x86_64: only call early_init_amd one time
>
> Andi's patch
> "
> x86: move X86_FEATURE_CONSTANT_TSC into early cpu feature detection
>
> Need this in the next patch in time_init and that happens early.
>
> This includes a minor fix on i386 where early_intel_workarounds()
> [which is now called early_init_intel] really executes early as
> the comments say.
> "
> calling early_init_amd in early_identify_cpu and identify_cpu two times.
>
> this patch remove the one in identify_cpu

thanks, applied.

Ingo