summaryrefslogtreecommitdiffstats
path: root/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-08-05 08:38:01 +0200
committerThorsten Leemhuis <fedora@leemhuis.info>2020-08-05 08:38:01 +0200
commitd8b1d4104de663bacffe18cf79ebf37fed8aac78 (patch)
tree2aceb7beb9cb45d90854d2d8e36ce108864fca46 /0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch
parent1b44a8c9fe0e71a8d14c49e78d9857f49d518a09 (diff)
parent9ab9ea2db0b13375d3d7114d5c82eb298a118740 (diff)
downloadkernel-d8b1d4104de663bacffe18cf79ebf37fed8aac78.tar.gz
kernel-d8b1d4104de663bacffe18cf79ebf37fed8aac78.tar.xz
kernel-d8b1d4104de663bacffe18cf79ebf37fed8aac78.zip
merge origin
Diffstat (limited to '0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch')
-rw-r--r--0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch4
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..81fa9b1b1 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 b6858adc4f17..4c2da9f17514 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);