OpenE2K
/
linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[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>
This commit is contained in:
Andi Kleen 2006-02-16 23:42:07 +01:00 committed by Linus Torvalds
parent ab68805955
commit 7fd67843b9
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/x86_64/kernel/apic.c
View File

@ -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);

3
arch/x86_64/kernel/time.c
View File

@ -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;

1
include/asm-x86_64/proto.h
View File

@ -133,6 +133,7 @@ extern int fix_aperture;
extern int force_iommu;
extern int reboot_force;
extern int notsc_setup(char *);
extern void smp_local_timer_interrupt(struct pt_regs * regs);