diff options
| author | Dave Jones <davej@redhat.com> | 2006-04-18 18:19:55 -0400 |
|---|---|---|
| committer | Dave Jones <davej@redhat.com> | 2006-04-18 18:19:55 -0400 |
| commit | f1f76afd71e0f17af9a35fcb649f4bab53304a4d (patch) | |
| tree | a56257b13a0eda4a9b7e950c3b85adad16341b80 /Documentation/x86_64/boot-options.txt | |
| parent | 530515a06f90c0831732709efee4a99497bd2b7c (diff) | |
| parent | 385910f2b275a636238f70844f1b6da9fda6f2da (diff) | |
Merge ../linus
Diffstat (limited to 'Documentation/x86_64/boot-options.txt')
| -rw-r--r-- | Documentation/x86_64/boot-options.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt index 1921353259ae..f2cd6ef53ff3 100644 --- a/Documentation/x86_64/boot-options.txt +++ b/Documentation/x86_64/boot-options.txt | |||
| @@ -151,6 +151,11 @@ NUMA | |||
| 151 | 151 | ||
| 152 | numa=fake=X Fake X nodes and ignore NUMA setup of the actual machine. | 152 | numa=fake=X Fake X nodes and ignore NUMA setup of the actual machine. |
| 153 | 153 | ||
| 154 | numa=hotadd=percent | ||
| 155 | Only allow hotadd memory to preallocate page structures upto | ||
| 156 | percent of already available memory. | ||
| 157 | numa=hotadd=0 will disable hotadd memory. | ||
| 158 | |||
| 154 | ACPI | 159 | ACPI |
| 155 | 160 | ||
| 156 | acpi=off Don't enable ACPI | 161 | acpi=off Don't enable ACPI |