aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCyrill Gorcunov <gorcunov@gmail.com>2008-08-24 02:01:41 -0700
committerIngo Molnar <mingo@elte.hu>2008-10-16 16:53:00 +0200
commit920fa7a507c3b1004a9ebe07a2c9d38605b3406a (patch)
tree82fed044bcbe2e3fac48a8816b2949bfd1929d33
parent7c37e48b5125fdb0acac846a0a3af42806175d44 (diff)
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>
-rw-r--r--arch/x86/kernel/apic_32.c10
-rw-r--r--arch/x86/kernel/apic_64.c2
2 files changed, 12 insertions, 0 deletions
diff --git a/arch/x86/kernel/apic_32.c b/arch/x86/kernel/apic_32.c
index 21c831d96af..df6ed603e54 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) {
diff --git a/arch/x86/kernel/apic_64.c b/arch/x86/kernel/apic_64.c
index bb46711a0b1..ddc5b245faf 100644
--- a/arch/x86/kernel/apic_64.c
+++ b/arch/x86/kernel/apic_64.c
@@ -1810,6 +1810,7 @@ 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;
@@ -1817,6 +1818,7 @@ static __init int setup_apicpmtimer(char *s)
return 0;
}
__setup("apicpmtimer", setup_apicpmtimer);
+#endif
static int __init apic_set_verbosity(char *arg)
{