diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-19 09:34:25 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-02-19 09:34:25 -0800 |
| commit | 4b205766d8fcb1627429ff31a4b36248b71a0df1 (patch) | |
| tree | 5a65425de7e96f67e92d00ef57dcaf9bbfcbf3d0 /include | |
| parent | fa079ba8a98ddc1101ddec902e95eea40ef1e0dc (diff) | |
| parent | ab362fffa0feb0da23191111e60b641d39130053 (diff) | |
Merge tag 'iommu-fixes-v5.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu
Pull iommu fixes from Joerg Roedel:
- Compile warning fix for the Intel IOMMU driver
- Fix kdump boot with Intel IOMMU enabled and in passthrough mode
- Disable AMD IOMMU on a Laptop/Embedded platform because the delay it
introduces in DMA transactions causes screen flickering there with 4k
monitors
- Make domain_free function in QCOM IOMMU driver robust and not leak
memory/dereference NULL pointers
- Fix ARM-SMMU module parameter prefix names
* tag 'iommu-fixes-v5.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
iommu/arm-smmu: Restore naming of driver parameter prefix
iommu/qcom: Fix bogus detach logic
iommu/amd: Disable IOMMU on Stoney Ridge systems
iommu/vt-d: Simplify check in identity_mapping()
iommu/vt-d: Remove deferred_attach_domain()
iommu/vt-d: Do deferred attachment in iommu_need_mapping()
iommu/vt-d: Move deferred device attachment into helper function
iommu/vt-d: Add attach_deferred() helper
iommu/vt-d: Fix compile warning from intel-svm.h
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/intel-svm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/linux/intel-svm.h b/include/linux/intel-svm.h index 94f047a8a845..d7c403d0dd27 100644 --- a/include/linux/intel-svm.h +++ b/include/linux/intel-svm.h @@ -122,7 +122,7 @@ static inline int intel_svm_unbind_mm(struct device *dev, int pasid) BUG(); } -static int intel_svm_is_pasid_valid(struct device *dev, int pasid) +static inline int intel_svm_is_pasid_valid(struct device *dev, int pasid) { return -EINVAL; } |