diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-20 22:15:34 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-20 22:15:34 +0200 |
| commit | a75753d4bf0e52a515eac7037cd3b43dc69278ca (patch) | |
| tree | 74361de798b639fdd9c5609a62dedabf2462d934 /0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch | |
| parent | 62f69986c96fa28778ad22537cf0fec14712d1e8 (diff) | |
| parent | bec7366f489c9a4e7aef141e9cd8246c06716c85 (diff) | |
| download | kernel-a75753d4bf0e52a515eac7037cd3b43dc69278ca.tar.gz kernel-a75753d4bf0e52a515eac7037cd3b43dc69278ca.tar.xz kernel-a75753d4bf0e52a515eac7037cd3b43dc69278ca.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc6.20200520git115a54162a6c.1.vanilla.1.fc33kernel-5.7.0-0.rc6.20200520git115a54162a6c.1.vanilla.1.fc32kernel-5.7.0-0.rc6.20200520git115a54162a6c.1.vanilla.1.fc31kernel-5.7.0-0.rc6.20200520git115a54162a6c.1.vanilla.1.fc30
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 632c069f4..158fd3889 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 7b375421afba..d4109b5c9705 100644 +index 1faa08c8bbb4..b64444b1bd1a 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -7,6 +7,7 @@ @@ -68,7 +68,7 @@ index 7b375421afba..d4109b5c9705 100644 #include <linux/kernel.h> #include <linux/bug.h> #include <linux/types.h> -@@ -2659,3 +2660,24 @@ int iommu_sva_get_pasid(struct iommu_sva *handle) +@@ -2664,3 +2665,24 @@ int iommu_sva_get_pasid(struct iommu_sva *handle) return ops->sva_get_pasid(handle); } EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); |