| commit | 7fd67843b96f90f59c9a244a1bc25137978a3ff9 | [log] [tgz] |
|---|---|---|
| author | Andi Kleen <ak@suse.de> | Thu Feb 16 23:42:07 2006 +0100 |
| committer | Linus Torvalds <torvalds@g5.osdl.org> | Fri Feb 17 08:00:40 2006 -0800 |
| tree | 600a7951745cc67f36075e5d60c30bd5ea842112 | |
| parent | ab68805955ee3dd84a6aa76cd70e61fde996968d [diff] [blame] |
[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>
diff --git a/arch/x86_64/kernel/time.c b/arch/x86_64/kernel/time.c index 3c58c30..67841d1 100644 --- a/arch/x86_64/kernel/time.c +++ b/arch/x86_64/kernel/time.c
@@ -1327,8 +1327,7 @@ __setup("nohpet", nohpet_setup); - -static int __init notsc_setup(char *s) +int __init notsc_setup(char *s) { notsc = 1; return 0;