summaryrefslogtreecommitdiffstats
path: root/arch/x86_64/kernel/setup.c
diff options
context:
space:
mode:
authorChuck Ebbert2005-09-12 18:49:25 +0200
committerLinus Torvalds2005-09-12 19:50:58 +0200
commit66759a01adbfe8828dd063e32cf5ed3f46696181 (patch)
tree9d34afafa1e4e5371a0e732a3f949ef8ac533ab5 /arch/x86_64/kernel/setup.c
parent[PATCH] x86-64: reduce x86-64 bug frame by 4 bytes (diff)
downloadkernel-qcow2-linux-66759a01adbfe8828dd063e32cf5ed3f46696181.tar.gz
kernel-qcow2-linux-66759a01adbfe8828dd063e32cf5ed3f46696181.tar.xz
kernel-qcow2-linux-66759a01adbfe8828dd063e32cf5ed3f46696181.zip
[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.c5
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)
#endif
#endif
+ if (!memcmp(from, "disable_timer_pin_1", 19))
+ disable_timer_pin_1 = 1;
+ if (!memcmp(from, "enable_timer_pin_1", 18))
+ disable_timer_pin_1 = -1;
+
if (!memcmp(from, "nolapic", 7) ||
!memcmp(from, "disableapic", 11))
disable_apic = 1;