diff options
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 856c8b114e71..12533a958c51 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -138,6 +138,12 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 138 | 138 | ||
| 139 | See also Documentation/pm.txt, pci=noacpi | 139 | See also Documentation/pm.txt, pci=noacpi |
| 140 | 140 | ||
| 141 | acpi_apic_instance= [ACPI, IOAPIC] | ||
| 142 | Format: <int> | ||
| 143 | 2: use 2nd APIC table, if available | ||
| 144 | 1,0: use 1st APIC table | ||
| 145 | default: 0 | ||
| 146 | |||
| 141 | acpi_sleep= [HW,ACPI] Sleep options | 147 | acpi_sleep= [HW,ACPI] Sleep options |
| 142 | Format: { s3_bios, s3_mode } | 148 | Format: { s3_bios, s3_mode } |
| 143 | See Documentation/power/video.txt | 149 | See Documentation/power/video.txt |
| @@ -774,6 +780,9 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 774 | lapic [IA-32,APIC] Enable the local APIC even if BIOS | 780 | lapic [IA-32,APIC] Enable the local APIC even if BIOS |
| 775 | disabled it. | 781 | disabled it. |
| 776 | 782 | ||
| 783 | lapic_timer_c2_ok [IA-32,x86-64,APIC] trust the local apic timer in | ||
| 784 | C2 power state. | ||
| 785 | |||
| 777 | lasi= [HW,SCSI] PARISC LASI driver for the 53c700 chip | 786 | lasi= [HW,SCSI] PARISC LASI driver for the 53c700 chip |
| 778 | Format: addr:<io>,irq:<irq> | 787 | Format: addr:<io>,irq:<irq> |
| 779 | 788 | ||
| @@ -1117,6 +1126,8 @@ and is between 256 and 4096 characters. It is defined in the file | |||
| 1117 | 1126 | ||
| 1118 | nolapic [IA-32,APIC] Do not enable or use the local APIC. | 1127 | nolapic [IA-32,APIC] Do not enable or use the local APIC. |
| 1119 | 1128 | ||
| 1129 | nolapic_timer [IA-32,APIC] Do not use the local APIC timer. | ||
| 1130 | |||
| 1120 | noltlbs [PPC] Do not use large page/tlb entries for kernel | 1131 | noltlbs [PPC] Do not use large page/tlb entries for kernel |
| 1121 | lowmem mapping on PPC40x. | 1132 | lowmem mapping on PPC40x. |
| 1122 | 1133 | ||
