iommu/s390: Use GFP_KERNEL in sleepable contexts

These contexts are sleepable, so use the proper annotation. The GFP_ATOMIC
was added mechanically in the prior patches.

Reviewed-by: Niklas Schnelle <schnelle@linux.ibm.com>
Reviewed-by: Matthew Rosato <mjrosato@linux.ibm.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/10-v3-76b587fe28df+6e3-iommu_map_gfp_jgg@nvidia.com
Signed-off-by: Joerg Roedel <jroedel@suse.de>

diff --git a/arch/s390/pci/pci_dma.c b/arch/s390/pci/pci_dma.c
index 2f6d05d..2d9b01d 100644 (file)
--- a/arch/s390/pci/pci_dma.c
+++ b/arch/s390/pci/pci_dma.c
@@ -579,7 +579,7 @@ int zpci_dma_init_device(struct zpci_dev *zdev)
 
        spin_lock_init(&zdev->iommu_bitmap_lock);
 
-       zdev->dma_table = dma_alloc_cpu_table(GFP_ATOMIC);
+       zdev->dma_table = dma_alloc_cpu_table(GFP_KERNEL);
        if (!zdev->dma_table) {
                rc = -ENOMEM;
                goto out;

diff --git a/drivers/iommu/s390-iommu.c b/drivers/iommu/s390-iommu.c
index 654ec44..7dcfffe 100644 (file)
--- a/drivers/iommu/s390-iommu.c
+++ b/drivers/iommu/s390-iommu.c
@@ -52,7 +52,7 @@ static struct iommu_domain *s390_domain_alloc(unsigned domain_type)
        if (!s390_domain)
                return NULL;
 
-       s390_domain->dma_table = dma_alloc_cpu_table(GFP_ATOMIC);
+       s390_domain->dma_table = dma_alloc_cpu_table(GFP_KERNEL);
        if (!s390_domain->dma_table) {
                kfree(s390_domain);
                return NULL;