diff options
| author | Yinghai Lu <Yinghai.Lu@Sun.COM> | 2008-01-30 13:33:18 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-01-30 13:33:18 +0100 |
| commit | 71617bf140fd5a35645527502cd330f84045d40c (patch) | |
| tree | a37b30471f7b0521ce155002eeebdaf191d4500d /arch/x86/kernel/setup_64.c | |
| parent | 99fc8d424bc5d803fe92cad56c068fe64e73747a (diff) | |
x86: 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 <yinghai.lu@sun.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'arch/x86/kernel/setup_64.c')
| -rw-r--r-- | arch/x86/kernel/setup_64.c | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/arch/x86/kernel/setup_64.c b/arch/x86/kernel/setup_64.c index 12948316e6a..08e85b79e70 100644 --- a/arch/x86/kernel/setup_64.c +++ b/arch/x86/kernel/setup_64.c @@ -954,6 +954,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; } } @@ -1020,14 +1023,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) |