Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7fd67843 authored by Andi Kleen's avatar Andi Kleen Committed by Linus Torvalds
Browse files

[PATCH] x86_64: Disable tsc when apicpmtimer is active 



Otherwise it has no effect anyways.

Signed-off-by: default avatarAndi Kleen <ak@suse.de>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent ab688059

arch/x86_64/kernel/apic.c

+1 −0
Original line number Diff line number Diff line
@@ -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);

arch/x86_64/kernel/time.c

+1 −2
Original line number Diff line number Diff line
@@ -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;

include/asm-x86_64/proto.h

+1 −0
Original line number Diff line number Diff line
@@ -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);