diff options
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 1150444a21ab..329dcabe4c5e 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -463,12 +463,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
463 | Range: 0 - 8192 | 463 | Range: 0 - 8192 |
464 | Default: 64 | 464 | Default: 64 |
465 | 465 | ||
466 | disable_8254_timer | ||
467 | enable_8254_timer | ||
468 | [IA32/X86_64] Disable/Enable interrupt 0 timer routing | ||
469 | over the 8254 in addition to over the IO-APIC. The | ||
470 | kernel tries to set a sensible default. | ||
471 | |||
472 | hpet= [X86-32,HPET] option to control HPET usage | 466 | hpet= [X86-32,HPET] option to control HPET usage |
473 | Format: { enable (default) | disable | force } | 467 | Format: { enable (default) | disable | force } |
474 | disable: disable HPET and use PIT instead | 468 | disable: disable HPET and use PIT instead |
@@ -1882,6 +1876,12 @@ and is between 256 and 4096 characters. It is defined in the file | |||
1882 | shapers= [NET] | 1876 | shapers= [NET] |
1883 | Maximal number of shapers. | 1877 | Maximal number of shapers. |
1884 | 1878 | ||
1879 | show_msr= [x86] show boot-time MSR settings | ||
1880 | Format: { <integer> } | ||
1881 | Show boot-time (BIOS-initialized) MSR settings. | ||
1882 | The parameter means the number of CPUs to show, | ||
1883 | for example 1 means boot CPU only. | ||
1884 | |||
1885 | sim710= [SCSI,HW] | 1885 | sim710= [SCSI,HW] |
1886 | See header of drivers/scsi/sim710.c. | 1886 | See header of drivers/scsi/sim710.c. |
1887 | 1887 | ||