diff options
| author | Andi Kleen <ak@suse.de> | 2006-02-16 23:42:07 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-17 08:00:40 -0800 |
| commit | 7fd67843b96f90f59c9a244a1bc25137978a3ff9 (patch) | |
| tree | 600a7951745cc67f36075e5d60c30bd5ea842112 /arch/x86_64 | |
| parent | ab68805955ee3dd84a6aa76cd70e61fde996968d (diff) | |
| download | talos-obmc-linux-7fd67843b96f90f59c9a244a1bc25137978a3ff9.tar.gz talos-obmc-linux-7fd67843b96f90f59c9a244a1bc25137978a3ff9.zip | |
[PATCH] x86_64: Disable tsc when apicpmtimer is active
Otherwise it has no effect anyways.
Signed-off-by: Andi Kleen <ak@suse.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64')
| -rw-r--r-- | arch/x86_64/kernel/apic.c | 1 | ||||
| -rw-r--r-- | arch/x86_64/kernel/time.c | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86_64/kernel/apic.c b/arch/x86_64/kernel/apic.c index 7a0a3e8d5d72..e5b14c57eaa0 100644 --- a/arch/x86_64/kernel/apic.c +++ b/arch/x86_64/kernel/apic.c @@ -1152,6 +1152,7 @@ __setup("noapicmaintimer", setup_noapicmaintimer); static __init int setup_apicpmtimer(char *s) { apic_calibrate_pmtmr = 1; + notsc_setup(NULL); return setup_apicmaintimer(NULL); } __setup("apicpmtimer", setup_apicpmtimer); diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index 3c58c30506a1..67841d11ed1f 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c @@ -1327,8 +1327,7 @@ static int __init nohpet_setup(char *s) __setup("nohpet", nohpet_setup); - -static int __init notsc_setup(char *s) +int __init notsc_setup(char *s) { notsc = 1; return 0; |
