diff options
| author | Andi Kleen <ak@suse.de> | 2005-01-14 23:23:30 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-01-14 23:23:30 -0800 |
| commit | b39e05b18a24e81b3fb244da3d863401374bc322 (patch) | |
| tree | 18372f20721b769daf9f4a4663164a01909c9730 /arch | |
| parent | e4550363c8e573b274266bc4e5854381b0fc1abb (diff) | |
| download | history-b39e05b18a24e81b3fb244da3d863401374bc322.tar.gz | |
[PATCH] x86_64: Move early CPU detection earlier
Move early CPU detection earlier. Needed for some followup patches and
makes sense in general.
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 2 | ||||
| -rw-r--r-- | arch/x86_64/kernel/setup64.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 407d42b2dc5582..384a439cad4d04 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c @@ -485,6 +485,8 @@ void __init setup_arch(char **cmdline_p) parse_cmdline_early(cmdline_p); + early_identify_cpu(&boot_cpu_data); + /* * partially used pages are not usable - thus * we are rounding upwards: diff --git a/arch/x86_64/kernel/setup64.c b/arch/x86_64/kernel/setup64.c index d07c439cafe4e0..2480983e7c827d 100644 --- a/arch/x86_64/kernel/setup64.c +++ b/arch/x86_64/kernel/setup64.c @@ -215,9 +215,6 @@ void __init cpu_init (void) asm volatile("pushfq ; popq %%rax ; btr $14,%%rax ; pushq %%rax ; popfq" ::: "eax"); - if (cpu == 0) - early_identify_cpu(&boot_cpu_data); - syscall_init(); wrmsrl(MSR_FS_BASE, 0); |