diff options
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/kernel-parameters.txt | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index bca6f389da66..968631678d4a 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -61,6 +61,7 @@ parameter is applicable: | |||
61 | MTD MTD support is enabled. | 61 | MTD MTD support is enabled. |
62 | NET Appropriate network support is enabled. | 62 | NET Appropriate network support is enabled. |
63 | NUMA NUMA support is enabled. | 63 | NUMA NUMA support is enabled. |
64 | GENERIC_TIME The generic timeofday code is enabled. | ||
64 | NFS Appropriate NFS support is enabled. | 65 | NFS Appropriate NFS support is enabled. |
65 | OSS OSS sound support is enabled. | 66 | OSS OSS sound support is enabled. |
66 | PARIDE The ParIDE subsystem is enabled. | 67 | PARIDE The ParIDE subsystem is enabled. |
@@ -341,10 +342,11 @@ running once the system is up. | |||
341 | Value can be changed at runtime via | 342 | Value can be changed at runtime via |
342 | /selinux/checkreqprot. | 343 | /selinux/checkreqprot. |
343 | 344 | ||
344 | clock= [BUGS=IA-32,HW] gettimeofday timesource override. | 345 | clock= [BUGS=IA-32, HW] gettimeofday clocksource override. |
345 | Forces specified timesource (if avaliable) to be used | 346 | [Deprecated] |
346 | when calculating gettimeofday(). If specicified | 347 | Forces specified clocksource (if avaliable) to be used |
347 | timesource is not avalible, it defaults to PIT. | 348 | when calculating gettimeofday(). If specified |
349 | clocksource is not avalible, it defaults to PIT. | ||
348 | Format: { pit | tsc | cyclone | pmtmr } | 350 | Format: { pit | tsc | cyclone | pmtmr } |
349 | 351 | ||
350 | disable_8254_timer | 352 | disable_8254_timer |
@@ -1617,6 +1619,10 @@ running once the system is up. | |||
1617 | 1619 | ||
1618 | time Show timing data prefixed to each printk message line | 1620 | time Show timing data prefixed to each printk message line |
1619 | 1621 | ||
1622 | clocksource= [GENERIC_TIME] Override the default clocksource | ||
1623 | Override the default clocksource and use the clocksource | ||
1624 | with the name specified. | ||
1625 | |||
1620 | tipar.timeout= [HW,PPT] | 1626 | tipar.timeout= [HW,PPT] |
1621 | Set communications timeout in tenths of a second | 1627 | Set communications timeout in tenths of a second |
1622 | (default 15). | 1628 | (default 15). |