diff options
| author |   Glauber Costa <glommer@redhat.com> | 2008-09-22 14:35:08 -0300 |
|---|---|---|
| committer |   Ingo Molnar <mingo@elte.hu> | 2008-10-13 10:21:49 +0200 |
| commit | e04d645f326bc8e591bc4ae21c4ab535987a17c1 (patch) | |
| tree | d3a84449192afd9c418dcf52926c8be4be73f2dd /arch/x86 | |
| parent | x86: wrap MCA_bus test around an ifdef (diff) | |
| download | linux-dev-e04d645f326bc8e591bc4ae21c4ab535987a17c1.tar.xz linux-dev-e04d645f326bc8e591bc4ae21c4ab535987a17c1.zip | |
x86: move vgetcpu mode probing to cpu detection
Take it out of time initialization and move it to
cpu detection time.
Signed-off-by: Glauber Costa <glommer@redhat.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 12 | ||||
| -rw-r--r-- | arch/x86/kernel/time_64.c | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 088fbdb6734e..f1af71851919 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -719,12 +719,24 @@ static void __cpuinit identify_cpu(struct cpuinfo_x86 *c) #endif } +#ifdef CONFIG_X86_64 +static void vgetcpu_set_mode(void) +{ + if (cpu_has(&boot_cpu_data, X86_FEATURE_RDTSCP)) + vgetcpu_mode = VGETCPU_RDTSCP; + else + vgetcpu_mode = VGETCPU_LSL; +} +#endif + void __init identify_boot_cpu(void) { identify_cpu(&boot_cpu_data); #ifdef CONFIG_X86_32 sysenter_setup(); enable_sep_cpu(); +#else + vgetcpu_set_mode(); #endif } diff --git a/arch/x86/kernel/time_64.c b/arch/x86/kernel/time_64.c index 207a7a1d7ac5..cb19d650c216 100644 --- a/arch/x86/kernel/time_64.c +++ b/arch/x86/kernel/time_64.c @@ -130,10 +130,6 @@ void __init hpet_time_init(void) void __init time_init(void) { tsc_init(); - if (cpu_has(&boot_cpu_data, X86_FEATURE_RDTSCP)) - vgetcpu_mode = VGETCPU_RDTSCP; - else - vgetcpu_mode = VGETCPU_LSL; late_time_init = choose_time_init(); } |