diff options
| author | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
|---|---|---|
| committer | Thorsten Leemhuis <fedora@leemhuis.info> | 2020-04-27 05:55:52 +0200 |
| commit | f7ba01a9677fffa21535bc6cdcad930a858d6106 (patch) | |
| tree | 6eb6df39221f8926b813d63b41ffed9da18e6a5d /0001-iommu-arm-smmu-workaround-DMA-mode-issues.patch | |
| parent | 837cd03f031f1daaa2dda23d584cda25b0dfd51e (diff) | |
| parent | 6c2cc50051831fa502a8b082a312ca90e7039f3f (diff) | |
| download | kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.gz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.tar.xz kernel-f7ba01a9677fffa21535bc6cdcad930a858d6106.zip | |
merge masterkernel-5.7.0-0.rc3.1.vanilla.1.fc33kernel-5.7.0-0.rc3.1.vanilla.1.fc32kernel-5.7.0-0.rc3.1.vanilla.1.fc31kernel-5.7.0-0.rc3.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 d9bef5f25..54245ac27 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 ad57e1e5bbf90b4b0edba18dd17b54cb5079d1cc Mon Sep 17 00:00:00 2001 +From 04e1b16dbb3abd8aa6be8c80b2f9944ca3b323e8 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 @@ -62,7 +62,7 @@ index 2b471419e26c..83c8d9845aed 100644 +++ b/drivers/iommu/iommu.c @@ -7,6 +7,7 @@ #define pr_fmt(fmt) "iommu: " fmt - + #include <linux/device.h> +#include <linux/dmi.h> #include <linux/kernel.h> @@ -94,5 +94,5 @@ index 2b471419e26c..83c8d9845aed 100644 +arch_initcall(iommu_quirks); +#endif -- -2.26.0 +2.26.2 |