diff options
Diffstat (limited to 'Documentation/kernel-parameters.txt')
-rw-r--r-- | Documentation/kernel-parameters.txt | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 9a5b6658c65e..622f7849edb9 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
@@ -138,7 +138,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
138 | strict -- Be less tolerant of platforms that are not | 138 | strict -- Be less tolerant of platforms that are not |
139 | strictly ACPI specification compliant. | 139 | strictly ACPI specification compliant. |
140 | 140 | ||
141 | See also Documentation/pm.txt, pci=noacpi | 141 | See also Documentation/power/pm.txt, pci=noacpi |
142 | 142 | ||
143 | acpi_apic_instance= [ACPI, IOAPIC] | 143 | acpi_apic_instance= [ACPI, IOAPIC] |
144 | Format: <int> | 144 | Format: <int> |
@@ -177,9 +177,6 @@ and is between 256 and 4096 characters. It is defined in the file | |||
177 | 177 | ||
178 | acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT | 178 | acpi_no_auto_ssdt [HW,ACPI] Disable automatic loading of SSDT |
179 | 179 | ||
180 | acpi_no_initrd_override [KNL,ACPI] | ||
181 | Disable loading custom ACPI tables from the initramfs | ||
182 | |||
183 | acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS | 180 | acpi_os_name= [HW,ACPI] Tell ACPI BIOS the name of the OS |
184 | Format: To spoof as Windows 98: ="Microsoft Windows" | 181 | Format: To spoof as Windows 98: ="Microsoft Windows" |
185 | 182 | ||
@@ -712,7 +709,7 @@ and is between 256 and 4096 characters. It is defined in the file | |||
712 | Format: <cyl>,<head>,<sect> | 709 | Format: <cyl>,<head>,<sect> |
713 | 710 | ||
714 | hd?= [HW] (E)IDE subsystem | 711 | hd?= [HW] (E)IDE subsystem |
715 | hd?lun= See Documentation/ide.txt. | 712 | hd?lun= See Documentation/ide/ide.txt. |
716 | 713 | ||
717 | highmem=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact | 714 | highmem=nn[KMG] [KNL,BOOT] forces the highmem zone to have an exact |
718 | size of <nn>. This works even on boxes that have no | 715 | size of <nn>. This works even on boxes that have no |
@@ -766,14 +763,14 @@ and is between 256 and 4096 characters. It is defined in the file | |||
766 | 763 | ||
767 | ide= [HW] (E)IDE subsystem | 764 | ide= [HW] (E)IDE subsystem |
768 | Format: ide=nodma or ide=doubler or ide=reverse | 765 | Format: ide=nodma or ide=doubler or ide=reverse |
769 | See Documentation/ide.txt. | 766 | See Documentation/ide/ide.txt. |
770 | 767 | ||
771 | ide?= [HW] (E)IDE subsystem | 768 | ide?= [HW] (E)IDE subsystem |
772 | Format: ide?=noprobe or chipset specific parameters. | 769 | Format: ide?=noprobe or chipset specific parameters. |
773 | See Documentation/ide.txt. | 770 | See Documentation/ide/ide.txt. |
774 | 771 | ||
775 | idebus= [HW] (E)IDE subsystem - VLB/PCI bus speed | 772 | idebus= [HW] (E)IDE subsystem - VLB/PCI bus speed |
776 | See Documentation/ide.txt. | 773 | See Documentation/ide/ide.txt. |
777 | 774 | ||
778 | idle= [X86] | 775 | idle= [X86] |
779 | Format: idle=poll or idle=mwait | 776 | Format: idle=poll or idle=mwait |