Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 71617bf1 authored by Yinghai Lu's avatar Yinghai Lu Committed by Ingo Molnar
Browse files

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: default avatarYinghai Lu <yinghai.lu@sun.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 99fc8d42

arch/x86/kernel/setup_64.c

+3 −8
Original line number Diff line number Diff line
@@ -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)