diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-04 21:13:34 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-05-04 21:13:34 +0200 |
| commit | fb8f64b7716fe6d20a7b0f0347f4706dd535146e (patch) | |
| tree | 3257ba109a43aaa3a8f65b75cf606dfcf30941ab /0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch | |
| parent | d9a167afba12983d586637ae44f8ea2f5682a92c (diff) | |
| parent | 2d4e33084f15019a901be7f4665ba14fe1020159 (diff) | |
| download | kernel-5.7.0-0.rc4.1.vanilla.1.fc31.tar.gz kernel-5.7.0-0.rc4.1.vanilla.1.fc31.tar.xz kernel-5.7.0-0.rc4.1.vanilla.1.fc31.zip | |
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedorakernel-5.7.0-0.rc4.1.vanilla.1.fc33kernel-5.7.0-0.rc4.1.vanilla.1.fc32kernel-5.7.0-0.rc4.1.vanilla.1.fc31kernel-5.7.0-0.rc4.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 | 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 58137a79b..bb672ccb3 100644 --- a/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch +++ b/0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch @@ -1,4 +1,4 @@ -From 1fcd2cc0007c520787df181f2b36987c1791aecd Mon Sep 17 00:00:00 2001 +From 754691c9d1eb4c03cbb1de446b519be495d16af2 Mon Sep 17 00:00:00 2001 From: Laura Abbott <labbott@redhat.com> Date: Mon, 20 May 2019 22:21:02 -0400 Subject: [PATCH] iommu/arm-smmu: workaround DMA mode issues @@ -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 2b471419e26c..83c8d9845aed 100644 +index 7b375421afba..d4109b5c9705 100644 --- a/drivers/iommu/iommu.c +++ b/drivers/iommu/iommu.c @@ -7,6 +7,7 @@ @@ -68,7 +68,7 @@ index 2b471419e26c..83c8d9845aed 100644 #include <linux/kernel.h> #include <linux/bug.h> #include <linux/types.h> -@@ -2658,3 +2659,24 @@ int iommu_sva_get_pasid(struct iommu_sva *handle) +@@ -2659,3 +2660,24 @@ int iommu_sva_get_pasid(struct iommu_sva *handle) return ops->sva_get_pasid(handle); } EXPORT_SYMBOL_GPL(iommu_sva_get_pasid); |