diff options
author | Cyrill Gorcunov <gorcunov@gmail.com> | 2008-08-24 13:01:41 +0400 |
---|---|---|
committer | Ingo Molnar <mingo@elte.hu> | 2008-10-16 18:53:00 +0400 |
commit | 920fa7a507c3b1004a9ebe07a2c9d38605b3406a (patch) | |
tree | 82fed044bcbe2e3fac48a8816b2949bfd1929d33 /arch/x86/kernel/apic_32.c | |
parent | 7c37e48b5125fdb0acac846a0a3af42806175d44 (diff) | |
download | linux-920fa7a507c3b1004a9ebe07a2c9d38605b3406a.tar.xz |
x86: apic - unify setup_apicpmtimer
Signed-off-by: Cyrill Gorcunov <gorcunov@gmail.com>
Signed-off-by: Yinghai Lu <yhlu.kernel@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'arch/x86/kernel/apic_32.c')
-rw-r--r-- | arch/x86/kernel/apic_32.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c index 21c831d96af3..df6ed603e547 100644 --- a/arch/x86/kernel/apic_32.c +++ b/arch/x86/kernel/apic_32.c @@ -1774,6 +1774,16 @@ static int __init parse_nolapic_timer(char *arg) } early_param("nolapic_timer", parse_nolapic_timer); +#ifdef CONFIG_X86_64 +static __init int setup_apicpmtimer(char *s) +{ + apic_calibrate_pmtmr = 1; + notsc_setup(NULL); + return 0; +} +__setup("apicpmtimer", setup_apicpmtimer); +#endif + static int __init apic_set_verbosity(char *arg) { if (!arg) { |