diff options
author | Chuck Ebbert <76306.1226@compuserve.com> | 2005-09-12 12:49:25 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-09-12 13:50:58 -0400 |
commit | 66759a01adbfe8828dd063e32cf5ed3f46696181 (patch) | |
tree | 9d34afafa1e4e5371a0e732a3f949ef8ac533ab5 /arch/x86_64/kernel/setup.c | |
parent | 049cdefe19f95b67b06b70915cd8e4ae7173337a (diff) |
[PATCH] x86-64: i386/x86-64: Fix time going twice as fast problem on ATI Xpress chipsets
Original patch from Bertro Simul
This is probably still not quite correct, but seems to be
the best solution so far.
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/x86_64/kernel/setup.c')
-rw-r--r-- | arch/x86_64/kernel/setup.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 869770da2933..351d8d64c2fb 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c | |||
@@ -336,6 +336,11 @@ static __init void parse_cmdline_early (char ** cmdline_p) | |||
336 | #endif | 336 | #endif |
337 | #endif | 337 | #endif |
338 | 338 | ||
339 | if (!memcmp(from, "disable_timer_pin_1", 19)) | ||
340 | disable_timer_pin_1 = 1; | ||
341 | if (!memcmp(from, "enable_timer_pin_1", 18)) | ||
342 | disable_timer_pin_1 = -1; | ||
343 | |||
339 | if (!memcmp(from, "nolapic", 7) || | 344 | if (!memcmp(from, "nolapic", 7) || |
340 | !memcmp(from, "disableapic", 11)) | 345 | !memcmp(from, "disableapic", 11)) |
341 | disable_apic = 1; | 346 | disable_apic = 1; |