Commit 429f27e3 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by Joerg Roedel
Browse files

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: default avatarNiklas Schnelle <schnelle@linux.ibm.com>
Reviewed-by: default avatarMatthew Rosato <mjrosato@linux.ibm.com>
Signed-off-by: default avatarJason Gunthorpe <jgg@nvidia.com>
Link: https://lore.kernel.org/r/10-v3-76b587fe28df+6e3-iommu_map_gfp_jgg@nvidia.com


Signed-off-by: default avatarJoerg Roedel <jroedel@suse.de>
parent d3b82825

arch/s390/pci/pci_dma.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/iommu/s390-iommu.c

+1 −1
Original line number Diff line number Diff line
@@ -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;