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
This commit is contained in:
Linus Torvalds 2011-12-09 08:08:14 -08:00
commit 592d44a5f8
4 changed files with 5 additions and 4 deletions

View File

@ -320,7 +320,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
on: enable for both 32- and 64-bit processes on: enable for both 32- and 64-bit processes
off: disable for both 32- and 64-bit processes off: disable for both 32- and 64-bit processes
amd_iommu= [HW,X86-84] amd_iommu= [HW,X86-64]
Pass parameters to the AMD IOMMU driver in the system. Pass parameters to the AMD IOMMU driver in the system.
Possible values are: Possible values are:
fullflush - enable flushing of IO/TLB entries when fullflush - enable flushing of IO/TLB entries when

View File

@ -511,8 +511,8 @@ M: Joerg Roedel <joerg.roedel@amd.com>
L: iommu@lists.linux-foundation.org L: iommu@lists.linux-foundation.org
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
S: Supported S: Supported
F: arch/x86/kernel/amd_iommu*.c F: drivers/iommu/amd_iommu*.[ch]
F: arch/x86/include/asm/amd_iommu*.h F: include/linux/amd-iommu.h
AMD MICROCODE UPDATE SUPPORT AMD MICROCODE UPDATE SUPPORT
M: Andreas Herrmann <andreas.herrmann3@amd.com> M: Andreas Herrmann <andreas.herrmann3@amd.com>

View File

@ -18,6 +18,7 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/bootmem.h> #include <linux/bootmem.h>
#include <linux/module.h>
#include <mach/irqs.h> #include <mach/irqs.h>
#include <mach/iommu.h> #include <mach/iommu.h>

View File

@ -245,7 +245,7 @@ static void put_hash_bucket(struct hash_bucket *bucket,
static bool exact_match(struct dma_debug_entry *a, struct dma_debug_entry *b) static bool exact_match(struct dma_debug_entry *a, struct dma_debug_entry *b)
{ {
return ((a->dev_addr == a->dev_addr) && return ((a->dev_addr == b->dev_addr) &&
(a->dev == b->dev)) ? true : false; (a->dev == b->dev)) ? true : false;
} }