aboutsummaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorIngo Molnar <mingo@elte.hu>2008-09-04 21:08:09 +0200
committerIngo Molnar <mingo@elte.hu>2008-09-04 21:08:09 +0200
commit62b3f981886b9b899eb0fc5fb59375f4512a1bd1 (patch)
tree08064a8c97ac6fb3f65a6363d2fda6f7417644f5 /Documentation
parentaf2e1f276ff08f17192411ea3b71c13a758dfe12 (diff)
parentb05f78f5c713eda2c34e495d92495ee4f1c3b5e1 (diff)
Merge branch 'x86/debug' into x86/cpu
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/kernel-parameters.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt
index 1150444a21a..82a079d4097 100644
--- a/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@ -1882,6 +1882,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.