diff options
-rw-r--r-- | Documentation/kernel-parameters.txt | 24 |
1 files changed, 20 insertions, 4 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 09220a1e22d9..aae2282600ca 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -396,6 +396,26 @@ and is between 256 and 4096 characters. It is defined in the file | |||
396 | clocksource is not available, it defaults to PIT. | 396 | clocksource is not available, it defaults to PIT. |
397 | Format: { pit | tsc | cyclone | pmtmr } | 397 | Format: { pit | tsc | cyclone | pmtmr } |
398 | 398 | ||
399 | clocksource= [GENERIC_TIME] Override the default clocksource | ||
400 | Format: <string> | ||
401 | Override the default clocksource and use the clocksource | ||
402 | with the name specified. | ||
403 | Some clocksource names to choose from, depending on | ||
404 | the platform: | ||
405 | [all] jiffies (this is the base, fallback clocksource) | ||
406 | [ACPI] acpi_pm | ||
407 | [ARM] imx_timer1,OSTS,netx_timer,mpu_timer2, | ||
408 | pxa_timer,timer3,32k_counter,timer0_1 | ||
409 | [AVR32] avr32 | ||
410 | [IA-32] pit,hpet,tsc,vmi-timer; | ||
411 | scx200_hrt on Geode; cyclone on IBM x440 | ||
412 | [MIPS] MIPS | ||
413 | [PARISC] cr16 | ||
414 | [S390] tod | ||
415 | [SH] SuperH | ||
416 | [SPARC64] tick | ||
417 | [X86-64] hpet,tsc | ||
418 | |||
399 | code_bytes [IA32] How many bytes of object code to print in an | 419 | code_bytes [IA32] How many bytes of object code to print in an |
400 | oops report. | 420 | oops report. |
401 | Range: 0 - 8192 | 421 | Range: 0 - 8192 |
@@ -1807,10 +1827,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1807 | 1827 | ||
1808 | time Show timing data prefixed to each printk message line | 1828 | time Show timing data prefixed to each printk message line |
1809 | 1829 | ||
1810 | clocksource= [GENERIC_TIME] Override the default clocksource | ||
1811 | Override the default clocksource and use the clocksource | ||
1812 | with the name specified. | ||
1813 | |||
1814 | tipar.timeout= [HW,PPT] | 1830 | tipar.timeout= [HW,PPT] |
1815 | Set communications timeout in tenths of a second | 1831 | Set communications timeout in tenths of a second |
1816 | (default 15). | 1832 | (default 15). |