diff options
author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-20 06:46:43 +0200 |
---|---|---|
committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-10-20 06:46:43 +0200 |
commit | 5ec75f810f09a224ce0f77ba312599eb4c7321bc (patch) | |
tree | dcb2b1a0d97363e1a678726925d875c1bea151fa /0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch | |
parent | 11a8f14639c96c38e142ba04c87f50de9c557ba7 (diff) | |
parent | a71ee103a729754519abc15fd58e6b258a89e58b (diff) | |
download | kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.tar.gz kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.tar.xz kernel-5ec75f810f09a224ce0f77ba312599eb4c7321bc.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.patch | 6 |
1 files changed, 3 insertions, 3 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..743be193d 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); @@ -94,5 +94,5 @@ index b6858adc4f17..4c2da9f17514 100644 +arch_initcall(iommu_quirks); +#endif -- -2.26.2 +2.28.0 |