diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-08 20:01:45 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2012-08-08 20:01:45 +0300 |
| commit | 7f46f9c13041c8fde331142791f3994a8fdbec6f (patch) | |
| tree | da24c058773a1392cf82b1a31ec6867f83803af6 /include | |
| parent | 6666cabf5af309c1c3e63a36e2580879fb40e827 (diff) | |
| parent | 31fe943599b7e5870edb9decb7fbb9538b218f26 (diff) | |
| download | linux-7f46f9c13041c8fde331142791f3994a8fdbec6f.tar.gz linux-7f46f9c13041c8fde331142791f3994a8fdbec6f.tar.bz2 linux-7f46f9c13041c8fde331142791f3994a8fdbec6f.zip | |
Merge tag 'iommu-fixes-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull IOMMU fixes from Joerg Roedel:
"These patches fix a couple of issues. First of all a few problems
with ACS on x86 introduced in the last merge window, where ACS did not
work on AMD and a NULL pointer dereference when there ran against
SR-IOV devices.
The patches fallen out of coccinelle checks fix a possible invalid
memory reference and a possible memory leak. The other patches mostly
fix build errors and warnings and a wrong return value."
* tag 'iommu-fixes-v3.6-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/amd: Fix ACS path checking
iommu/intel: Fix ACS path checking
iommu/amd: Fix pci_request_acs() call-place
iommu/exynos: Fix build error
iommu/tegra: smmu: Fix error initial value at domain_init
iommu/tegra: smmu: Cleanup with lesser nest
iommu: Add missing forward declaration in include file
iommu: Include linux/types.h
iommu/intel: add missing free_domain_mem
iommu/tegra: remove invalid reference to list iterator variable
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/iommu.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/iommu.h b/include/linux/iommu.h index 54d6d690073c..7e83370e6fd2 100644 --- a/include/linux/iommu.h +++ b/include/linux/iommu.h @@ -20,6 +20,7 @@ #define __LINUX_IOMMU_H #include <linux/errno.h> +#include <linux/types.h> #define IOMMU_READ (1) #define IOMMU_WRITE (2) @@ -30,6 +31,7 @@ struct iommu_group; struct bus_type; struct device; struct iommu_domain; +struct notifier_block; /* iommu fault flags */ #define IOMMU_FAULT_READ 0x0 |