diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-08-13 20:17:57 +0200 |
| commit | f05c02032c007399078784ea2ace322385f869b9 (patch) | |
| tree | 7c1bd28f37be1d28a3c8ace051c55472ba8bdd63 /0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch | |
| parent | 55576abe986db86a9f4e2b105d2451800d652217 (diff) | |
| parent | f7a3bf654752fa0e92c7ab3e57e48d3415632852 (diff) | |
| download | kernel-f05c02032c007399078784ea2ace322385f869b9.tar.gz kernel-f05c02032c007399078784ea2ace322385f869b9.tar.xz kernel-f05c02032c007399078784ea2ace322385f869b9.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
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 81fa9b1b1..06818dc47 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 b6858adc4f17..4c2da9f17514 100644 +index 609bd25bf154..c701912b13ab 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -7,6 +7,7 @@ @@ -68,7 +68,7 @@ index b6858adc4f17..4c2da9f17514 100644 #include <linux/kernel.h> #include <linux/bug.h> #include <linux/types.h> -@@ -2838,3 +2839,24 @@ int iommu_sva_get_pasid(struct iommu_sva *handle) +@@ -2849,3 +2850,24 @@ int iommu_sva_get_pasid(struct iommu_sva *handle) return ops->sva_get_pasid(handle); } EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); |