Skip to content

Commit 429f27e

Browse files
jgunthorpejoergroedel
authored andcommitted
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>
1 parent d3b8282 commit 429f27e

2 files changed

Lines changed: 2 additions & 2 deletions

File tree

arch/s390/pci/pci_dma.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -579,7 +579,7 @@ int zpci_dma_init_device(struct zpci_dev *zdev)
579579

580580
spin_lock_init(&zdev->iommu_bitmap_lock);
581581

582-
zdev->dma_table = dma_alloc_cpu_table(GFP_ATOMIC);
582+
zdev->dma_table = dma_alloc_cpu_table(GFP_KERNEL);
583583
if (!zdev->dma_table) {
584584
rc = -ENOMEM;
585585
goto out;

drivers/iommu/s390-iommu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ static struct iommu_domain *s390_domain_alloc(unsigned domain_type)
5252
if (!s390_domain)
5353
return NULL;
5454

55-
s390_domain->dma_table = dma_alloc_cpu_table(GFP_ATOMIC);
55+
s390_domain->dma_table = dma_alloc_cpu_table(GFP_KERNEL);
5656
if (!s390_domain->dma_table) {
5757
kfree(s390_domain);
5858
return NULL;

0 commit comments

Comments
 (0)