From 0bc4d3294dc613c9cfd970bfd97b2c7f6908d772 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 29 Jul 2019 18:54:20 +0200 Subject: [PATCH] 5.2-stable patches added patches: iommu-iova-fix-compilation-error-with-config_iommu_iova.patch --- ...ilation-error-with-config_iommu_iova.patch | 31 +++++++++++++++++++ queue-5.2/series | 1 + 2 files changed, 32 insertions(+) create mode 100644 queue-5.2/iommu-iova-fix-compilation-error-with-config_iommu_iova.patch diff --git a/queue-5.2/iommu-iova-fix-compilation-error-with-config_iommu_iova.patch b/queue-5.2/iommu-iova-fix-compilation-error-with-config_iommu_iova.patch new file mode 100644 index 00000000000..923a2b195fc --- /dev/null +++ b/queue-5.2/iommu-iova-fix-compilation-error-with-config_iommu_iova.patch @@ -0,0 +1,31 @@ +From 201c1db90cd643282185a00770f12f95da330eca Mon Sep 17 00:00:00 2001 +From: Joerg Roedel +Date: Tue, 23 Jul 2019 09:51:00 +0200 +Subject: iommu/iova: Fix compilation error with !CONFIG_IOMMU_IOVA + +From: Joerg Roedel + +commit 201c1db90cd643282185a00770f12f95da330eca upstream. + +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 +Signed-off-by: Greg Kroah-Hartman + +--- + include/linux/iova.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/linux/iova.h ++++ b/include/linux/iova.h +@@ -236,7 +236,7 @@ static inline void init_iova_domain(stru + { + } + +-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/queue-5.2/series b/queue-5.2/series index 403bde47559..19c8e4ee5b5 100644 --- a/queue-5.2/series +++ b/queue-5.2/series @@ -201,3 +201,4 @@ powerpc-pmu-set-pmcregs_in_use-in-paca-when-running-as-lpar.patch io_uring-fix-the-sequence-comparison-in-io_sequence_defer.patch iommu-vt-d-don-t-queue_iova-if-there-is-no-flush-queue.patch iommu-iova-remove-stale-cached32_node.patch +iommu-iova-fix-compilation-error-with-config_iommu_iova.patch -- 2.47.3