diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-20 03:02:39 -0500 |
| commit | fbc2a06056c9aa3cb8c44bf1cfeb1d260e229e5c (patch) | |
| tree | feb2a1c13ad3dff5a8c7ab3c0265e8eca7a0c5a3 /Documentation/x86/x86_64/boot-options.txt | |
| parent | a3d732f93785da17e0137210deadb4616f5536fc (diff) | |
| parent | ee2f6cc7f9ea2542ad46070ed62ba7aa04d08871 (diff) | |
Merge branch 'linus' into x86/uv
Diffstat (limited to 'Documentation/x86/x86_64/boot-options.txt')
| -rw-r--r-- | Documentation/x86/x86_64/boot-options.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/x86/x86_64/boot-options.txt b/Documentation/x86/x86_64/boot-options.txt index 72ffb5373ec7..f6d561a1a9b2 100644 --- a/Documentation/x86/x86_64/boot-options.txt +++ b/Documentation/x86/x86_64/boot-options.txt | |||
| @@ -35,7 +35,7 @@ APICs | |||
| 35 | 35 | ||
| 36 | nolapic Don't use the local APIC (alias for i386 compatibility) | 36 | nolapic Don't use the local APIC (alias for i386 compatibility) |
| 37 | 37 | ||
| 38 | pirq=... See Documentation/i386/IO-APIC.txt | 38 | pirq=... See Documentation/x86/i386/IO-APIC.txt |
| 39 | 39 | ||
| 40 | noapictimer Don't set up the APIC timer | 40 | noapictimer Don't set up the APIC timer |
| 41 | 41 | ||
| @@ -139,7 +139,7 @@ Non Executable Mappings | |||
| 139 | SMP | 139 | SMP |
| 140 | 140 | ||
| 141 | additional_cpus=NUM Allow NUM more CPUs for hotplug | 141 | additional_cpus=NUM Allow NUM more CPUs for hotplug |
| 142 | (defaults are specified by the BIOS, see Documentation/x86_64/cpu-hotplug-spec) | 142 | (defaults are specified by the BIOS, see Documentation/x86/x86_64/cpu-hotplug-spec) |
| 143 | 143 | ||
| 144 | NUMA | 144 | NUMA |
| 145 | 145 | ||