aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJohn Stultz <john.stultz@linaro.org>2010-12-02 16:47:52 -0800
committerJohn Stultz <john.stultz@linaro.org>2010-12-02 16:47:52 -0800
commitb0f969009f647cd473c5e559aeec9c4229d12f87 (patch)
tree34778ededa7623d811be4ac143a098a5dc11eed5 /Documentation
parent3561d43fd289f590fdae672e5eb831b8d5cf0bf6 (diff)
parentd3b8f889a220aed825accc28eb64ce283a0d51ac (diff)
downloadlinux-linaro-android-b0f969009f647cd473c5e559aeec9c4229d12f87.tar.gz
Merge remote branch 'tip/x86/tsc' into fortglx/2.6.38/tip/x86/tsc
Conflicts: Documentation/kernel-parameters.txt
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt9
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 92e83e53148..c7c8eca5b2b 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2467,12 +2467,13 @@ and is between 256 and 4096 characters. It is defined in the file
to facilitate early boot debugging.
See also Documentation/trace/events.txt
- tsc= Disable clocksource-must-verify flag for TSC.
+ tsc= Disable clocksource stability checks for TSC.
Format: <string>
[x86] reliable: mark tsc clocksource as reliable, this
- disables clocksource verification at runtime.
- Used to enable high-resolution timer mode on older
- hardware, and in virtualized environment.
+ disables clocksource verification at runtime, as well
+ as the stability checks done at bootup. Used to enable
+ high-resolution timer mode on older hardware, and in
+ virtualized environment.
[x86] noirqtime: Do not use TSC to do irq accounting.
Used to run time disable IRQ_TIME_ACCOUNTING on any
platforms where RDTSC is slow and this accounting