diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-09 11:08:14 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-12-09 11:08:14 -0500 |
| commit | 592d44a5f8458892c007c61b9cfa677efede5e1e (patch) | |
| tree | cec376faf5dd25e1ce89134b0503d8354e473392 /Documentation | |
| parent | 3ab345fc4b95a981a83f616487bbe07ddb5b1b1a (diff) | |
| parent | b2c1639135c0fc1560f3fe9a3a83f2c8265a9e02 (diff) | |
Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
* 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
MAINTAINERS: Update amd-iommu F: patterns
iommu/amd: Fix typo in kernel-parameters.txt
iommu/msm: Fix compile error in mach-msm/devices-iommu.c
Fix comparison using wrong pointer variable in dma debug code
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 5e22c3f1f8bd..81c287fad79d 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -320,7 +320,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
| 320 | on: enable for both 32- and 64-bit processes | 320 | on: enable for both 32- and 64-bit processes |
| 321 | off: disable for both 32- and 64-bit processes | 321 | off: disable for both 32- and 64-bit processes |
| 322 | 322 | ||
| 323 | amd_iommu= [HW,X86-84] | 323 | amd_iommu= [HW,X86-64] |
| 324 | Pass parameters to the AMD IOMMU driver in the system. | 324 | Pass parameters to the AMD IOMMU driver in the system. |
| 325 | Possible values are: | 325 | Possible values are: |
| 326 | fullflush - enable flushing of IO/TLB entries when | 326 | fullflush - enable flushing of IO/TLB entries when |