aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/kernel-parameters.txt
diff options
context:
space:
mode:
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r--Documentation/kernel-parameters.txt12
1 files changed, 6 insertions, 6 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 040ce30632b..a2701cb6b37 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -468,12 +468,6 @@ and is between 256 and 4096 characters. It is defined in the file
468 Range: 0 - 8192 468 Range: 0 - 8192
469 Default: 64 469 Default: 64
470 470
471 disable_8254_timer
472 enable_8254_timer
473 [IA32/X86_64] Disable/Enable interrupt 0 timer routing
474 over the 8254 in addition to over the IO-APIC. The
475 kernel tries to set a sensible default.
476
477 hpet= [X86-32,HPET] option to control HPET usage 471 hpet= [X86-32,HPET] option to control HPET usage
478 Format: { enable (default) | disable | force } 472 Format: { enable (default) | disable | force }
479 disable: disable HPET and use PIT instead 473 disable: disable HPET and use PIT instead
@@ -1887,6 +1881,12 @@ and is between 256 and 4096 characters. It is defined in the file
1887 shapers= [NET] 1881 shapers= [NET]
1888 Maximal number of shapers. 1882 Maximal number of shapers.
1889 1883
1884 show_msr= [x86] show boot-time MSR settings
1885 Format: { <integer> }
1886 Show boot-time (BIOS-initialized) MSR settings.
1887 The parameter means the number of CPUs to show,
1888 for example 1 means boot CPU only.
1889
1890 sim710= [SCSI,HW] 1890 sim710= [SCSI,HW]
1891 See header of drivers/scsi/sim710.c. 1891 See header of drivers/scsi/sim710.c.
1892 1892