path: root/Documentation/kernel-parameters.txt
diff options
authorLinus Torvalds <torvalds@linux-foundation.org>2011-01-06 11:08:14 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2011-01-06 11:08:14 -0800
commitd7a5a18190d6f523b5d795bfd73f83cf13a3a383 (patch)
treea7ec0b814d18c78b42403afae048346f45f82adc /Documentation/kernel-parameters.txt
parent4f00b901d4233a78e6ca4d44c8c6fc5d38a3ee9e (diff)
parenta8760eca6cf60ed303ad494ef45901f63165d2c8 (diff)
Merge branch 'x86-tsc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'x86-tsc-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86: Check tsc available/disabled in the delayed init function x86: Improve TSC calibration using a delayed workqueue x86: Make tsc=reliable override boot time stability checks
Diffstat (limited to 'Documentation/kernel-parameters.txt')
1 files changed, 5 insertions, 4 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index d6496fde618..f3dc951e949 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -2461,12 +2461,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