Home Home > GIT Browse > SLE12-SP4
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Roedel <jroedel@suse.de>2019-08-09 13:40:34 +0200
committerJoerg Roedel <jroedel@suse.de>2019-08-09 13:40:34 +0200
commit85606f6626db96eac57addcbeb5983a82daf9a75 (patch)
treefc00a292535bb477dc160c40e07ad2644e0a5eba
parentfbc80f2bac45da51f4ee9e887d685355432e8666 (diff)
iommu/iova: Fix compilation error with !CONFIG_IOMMU_IOVA (bsc#1145024).
-rw-r--r--patches.drivers/iommu-iova-fix-compilation-error-with-config_iommu_iova30
-rw-r--r--series.conf1
2 files changed, 31 insertions, 0 deletions
diff --git a/patches.drivers/iommu-iova-fix-compilation-error-with-config_iommu_iova b/patches.drivers/iommu-iova-fix-compilation-error-with-config_iommu_iova
new file mode 100644
index 0000000000..61817eae9f
--- /dev/null
+++ b/patches.drivers/iommu-iova-fix-compilation-error-with-config_iommu_iova
@@ -0,0 +1,30 @@
+From: Joerg Roedel <jroedel@suse.de>
+Date: Tue, 23 Jul 2019 09:51:00 +0200
+Subject: iommu/iova: Fix compilation error with !CONFIG_IOMMU_IOVA
+Git-commit: 201c1db90cd643282185a00770f12f95da330eca
+Patch-mainline: v5.3-rc2
+References: bsc#1145024
+
+The stub function for !CONFIG_IOMMU_IOVA needs to be
+'static inline'.
+
+Fixes: effa467870c76 ('iommu/vt-d: Don't queue_iova() if there is no flush queue')
+Signed-off-by: Joerg Roedel <jroedel@suse.de>
+---
+ include/linux/iova.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/include/linux/iova.h b/include/linux/iova.h
+index cd0f1de901a8..a0637abffee8 100644
+--- a/include/linux/iova.h
++++ b/include/linux/iova.h
+@@ -236,7 +236,7 @@ static inline void init_iova_domain(struct iova_domain *iovad,
+ {
+ }
+
+-bool has_iova_flush_queue(struct iova_domain *iovad)
++static inline bool has_iova_flush_queue(struct iova_domain *iovad)
+ {
+ return false;
+ }
+
diff --git a/series.conf b/series.conf
index 90c5dc2fdb..7e307cf520 100644
--- a/series.conf
+++ b/series.conf
@@ -23467,6 +23467,7 @@
patches.arch/powerpc-tm-Fix-oops-on-sigreturn-on-systems-without-.patch
patches.drivers/hwmon-nct6775-Fix-register-address-and-added-missed-.patch
patches.drivers/iommu-vt-d-don-t-queue_iova-if-there-is-no-flush-queue
+ patches.drivers/iommu-iova-fix-compilation-error-with-config_iommu_iova
patches.drivers/ALSA-line6-Fix-wrong-altsetting-for-LINE6_PODHD500_1.patch
patches.drivers/ALSA-line6-Fix-a-typo.patch
patches.drivers/ALSA-compress-Fix-regression-on-compressed-capture-s.patch