Merge branches 'x86/alternatives', 'x86/cleanups', 'x86/commandline', 'x86/crashdump...

[mv-sheeva.git] / Documentation / kernel-parameters.txt

diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 53b0a8f5b23bb6f5c7d9533a1646a0ac9e7bf67e..329dcabe4c5eae0382a2902839d0f91d69d442d7 100644 (file)
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1068,6 +1068,9 @@ and is between 256 and 4096 characters. It is defined in the file
 
                        * [no]ncq: Turn on or off NCQ.
 
+                       * nohrst, nosrst, norst: suppress hard, soft
+                          and both resets.
+
                        If there are multiple matching configurations changing
                        the same attribute, the last one is used.
 
@@ -1873,6 +1876,12 @@ and is between 256 and 4096 characters. It is defined in the file
        shapers=        [NET]
                        Maximal number of shapers.
 
+       show_msr=       [x86] show boot-time MSR settings
+                       Format: { <integer> }
+                       Show boot-time (BIOS-initialized) MSR settings.
+                       The parameter means the number of CPUs to show,
+                       for example 1 means boot CPU only.
+
        sim710=         [SCSI,HW]
                        See header of drivers/scsi/sim710.c.