From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Tue, 24 Oct 2023 08:22:46 +0000 (+0200)
Subject: fix up queue-4.14/s390-pci-fix-iommu-bitmap-allocation.patch
X-Git-Tag: v4.14.328~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=76f02980e3c63e8adafc86963ef49da5999989a5;p=thirdparty%2Fkernel%2Fstable-queue.git

fix up queue-4.14/s390-pci-fix-iommu-bitmap-allocation.patch
---

diff --git a/queue-4.14/s390-pci-fix-iommu-bitmap-allocation.patch b/queue-4.14/s390-pci-fix-iommu-bitmap-allocation.patch
index ebf7cc21a0f..fd6338b71be 100644
--- a/queue-4.14/s390-pci-fix-iommu-bitmap-allocation.patch
+++ b/queue-4.14/s390-pci-fix-iommu-bitmap-allocation.patch
@@ -38,12 +38,20 @@ Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com>
 Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 ---
- arch/s390/pci/pci_dma.c |   15 +++++++++++++--
- 1 file changed, 13 insertions(+), 2 deletions(-)
+ arch/s390/pci/pci_dma.c |   16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
 
 --- a/arch/s390/pci/pci_dma.c
 +++ b/arch/s390/pci/pci_dma.c
-@@ -527,6 +527,17 @@ static void s390_dma_unmap_sg(struct dev
+@@ -12,6 +12,7 @@
+ #include <linux/dma-mapping.h>
+ #include <linux/vmalloc.h>
+ #include <linux/pci.h>
++#include <linux/overflow.h>
+ #include <asm/pci_dma.h>
+ 
+ #define S390_MAPPING_ERROR		(~(dma_addr_t) 0x0)
+@@ -527,6 +528,17 @@ static void s390_dma_unmap_sg(struct dev
  		s->dma_length = 0;
  	}
  }
@@ -61,7 +69,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  	
  static int s390_mapping_error(struct device *dev, dma_addr_t dma_addr)
  {
-@@ -568,13 +579,13 @@ int zpci_dma_init_device(struct zpci_dev
+@@ -568,13 +580,13 @@ int zpci_dma_init_device(struct zpci_dev
  				zdev->end_dma - zdev->start_dma + 1);
  	zdev->end_dma = zdev->start_dma + zdev->iommu_size - 1;
  	zdev->iommu_pages = zdev->iommu_size >> PAGE_SHIFT;