diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:26:28 -0500 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2006-01-17 10:26:28 -0500 |
| commit | 0825788ff27c7145e9d558cb2a26f3837d1f9be5 (patch) | |
| tree | f6bdb892cec8ca0df69c08a3477c89f1542999e5 /Documentation/x86_64/boot-options.txt | |
| parent | 02f693c7118f6be9e677070eb630c1f3a654cdd3 (diff) | |
| parent | 1bc4ccfff8675adc3d96f91245eb7e2dc0043ca9 (diff) | |
Merge branch 'upstream'
Diffstat (limited to 'Documentation/x86_64/boot-options.txt')
| -rw-r--r-- | Documentation/x86_64/boot-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt index e566affeed7..9c5fc15d03d 100644 --- a/Documentation/x86_64/boot-options.txt +++ b/Documentation/x86_64/boot-options.txt @@ -125,7 +125,7 @@ SMP cpumask=MASK only use cpus with bits set in mask additional_cpus=NUM Allow NUM more CPUs for hotplug - (defaults are specified by the BIOS or half the available CPUs) + (defaults are specified by the BIOS, see Documentation/x86_64/cpu-hotplug-spec) NUMA @@ -198,6 +198,6 @@ Debugging Misc - noreplacement Don't replace instructions with more appropiate ones + noreplacement Don't replace instructions with more appropriate ones for the CPU. This may be useful on asymmetric MP systems where some CPU have less capabilities than the others. |