diff options
Diffstat (limited to 'Documentation/x86_64/boot-options.txt')
-rw-r--r-- | Documentation/x86_64/boot-options.txt | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Documentation/x86_64/boot-options.txt b/Documentation/x86_64/boot-options.txt index f3c57f43ba64..dbdcaf68e3ea 100644 --- a/Documentation/x86_64/boot-options.txt +++ b/Documentation/x86_64/boot-options.txt | |||
@@ -52,10 +52,6 @@ APICs | |||
52 | apicmaintimer. Useful when your PIT timer is totally | 52 | apicmaintimer. Useful when your PIT timer is totally |
53 | broken. | 53 | broken. |
54 | 54 | ||
55 | disable_8254_timer / enable_8254_timer | ||
56 | Enable interrupt 0 timer routing over the 8254 in addition to over | ||
57 | the IO-APIC. The kernel tries to set a sensible default. | ||
58 | |||
59 | Early Console | 55 | Early Console |
60 | 56 | ||
61 | syntax: earlyprintk=vga | 57 | syntax: earlyprintk=vga |
@@ -183,7 +179,7 @@ PCI | |||
183 | IOMMU | 179 | IOMMU |
184 | 180 | ||
185 | iommu=[size][,noagp][,off][,force][,noforce][,leak][,memaper[=order]][,merge] | 181 | iommu=[size][,noagp][,off][,force][,noforce][,leak][,memaper[=order]][,merge] |
186 | [,forcesac][,fullflush][,nomerge][,noaperture] | 182 | [,forcesac][,fullflush][,nomerge][,noaperture][,calgary] |
187 | size set size of iommu (in bytes) | 183 | size set size of iommu (in bytes) |
188 | noagp don't initialize the AGP driver and use full aperture. | 184 | noagp don't initialize the AGP driver and use full aperture. |
189 | off don't use the IOMMU | 185 | off don't use the IOMMU |
@@ -204,6 +200,7 @@ IOMMU | |||
204 | buffering. | 200 | buffering. |
205 | nodac Forbid DMA >4GB | 201 | nodac Forbid DMA >4GB |
206 | panic Always panic when IOMMU overflows | 202 | panic Always panic when IOMMU overflows |
203 | calgary Use the Calgary IOMMU if it is available | ||
207 | 204 | ||
208 | swiotlb=pages[,force] | 205 | swiotlb=pages[,force] |
209 | 206 | ||