diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-09-05 09:19:50 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-09-05 09:19:50 +0200 |
| commit | 446d27338d3b422dd3dfe496d0f362230994d059 (patch) | |
| tree | 3452a8c7c487675020b2a2137635bc7dfede57fe /Documentation | |
| parent | accf0fa697eeb5ff4c2360edc4da5b10abac0b7b (diff) | |
| parent | 0a488a53d7ca46ac638c30079072c57e50cfcc7b (diff) | |
Merge branch 'x86/cpu' into x86/core
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index ba27dd98a18..1de51110e62 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1888,6 +1888,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. |