Skip to content

Commit

Permalink
Merge branch 'iommu/fixes' of git://git.kernel.org/pub/scm/linux/kern…
Browse files Browse the repository at this point in the history
…el/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
  • Loading branch information
torvalds committed Dec 9, 2011

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
2 parents 3ab345f + b2c1639 commit 592d44a
Showing 4 changed files with 5 additions and 4 deletions.
2 changes: 1 addition & 1 deletion Documentation/kernel-parameters.txt
Original file line number Diff line number Diff line change
@@ -320,7 +320,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted.
on: enable 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.
Possible values are:
fullflush - enable flushing of IO/TLB entries when
4 changes: 2 additions & 2 deletions MAINTAINERS
Original file line number Diff line number Diff line change
@@ -511,8 +511,8 @@ M: Joerg Roedel <[email protected]>
L: [email protected]
T: git git://git.kernel.org/pub/scm/linux/kernel/git/joro/linux-2.6-iommu.git
S: Supported
F: arch/x86/kernel/amd_iommu*.c
F: arch/x86/include/asm/amd_iommu*.h
F: drivers/iommu/amd_iommu*.[ch]
F: include/linux/amd-iommu.h

AMD MICROCODE UPDATE SUPPORT
M: Andreas Herrmann <[email protected]>
1 change: 1 addition & 0 deletions arch/arm/mach-msm/devices-iommu.c
Original file line number Diff line number Diff line change
@@ -18,6 +18,7 @@
#include <linux/kernel.h>
#include <linux/platform_device.h>
#include <linux/bootmem.h>
#include <linux/module.h>
#include <mach/irqs.h>
#include <mach/iommu.h>

2 changes: 1 addition & 1 deletion lib/dma-debug.c
Original file line number Diff line number Diff line change
@@ -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)
{
return ((a->dev_addr == a->dev_addr) &&
return ((a->dev_addr == b->dev_addr) &&
(a->dev == b->dev)) ? true : false;
}

0 comments on commit 592d44a

Please sign in to comment.