diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-06-11 05:54:53 +0200 |
| commit | 168917328214e94a54dbd4ef227dab46029b8134 (patch) | |
| tree | 9f5fbf0580f00cf39b1b0cfe1dacc387499e999f /0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch | |
| parent | 38d5c149cae32d286308f7962e1d561e7939072f (diff) | |
| parent | 8ae1eddbf56e902877016abbadb2150afe87711c (diff) | |
| download | kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.gz kernel-168917328214e94a54dbd4ef227dab46029b8134.tar.xz kernel-168917328214e94a54dbd4ef227dab46029b8134.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc33kernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc32kernel-5.8.0-0.rc0.20200610git84fc461db99b.1.vanilla.1.fc31
Diffstat (limited to '0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch')
| -rw-r--r-- | 0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch b/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch index e6eef22d6..08db80130 100644 --- a/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch +++ b/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch @@ -57,7 +57,7 @@ Signed-off-by: Laura Abbott <labbott@redhat.com> 1 file changed, 22 insertions(+) diff --git a/drivers/iommu/iommu.c b/drivers/iommu/iommu.c -index 03d6a26687bc..86981f228c90 100644 +index d43120eb1dc5..1920be30a378 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -7,6 +7,7 @@ @@ -68,7 +68,7 @@ index 03d6a26687bc..86981f228c90 100644 #include <linux/kernel.h> #include <linux/bug.h> #include <linux/types.h> -@@ -2664,3 +2665,24 @@ int iommu_sva_get_pasid(struct iommu_sva *handle) +@@ -2838,3 +2839,24 @@ int iommu_sva_get_pasid(struct iommu_sva *handle) return ops->sva_get_pasid(handle); } EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); |