Merge tag 'v6.2' into iommufd.git for-next

[platform/kernel/linux-rpi.git] / drivers / infiniband / hw / usnic / usnic_uiom.c

diff --git a/drivers/infiniband/hw/usnic/usnic_uiom.c b/drivers/infiniband/hw/usnic/usnic_uiom.c
index aeeaca6..2a5cac2 100644 (file)
--- a/drivers/infiniband/hw/usnic/usnic_uiom.c
+++ b/drivers/infiniband/hw/usnic/usnic_uiom.c
@@ -277,7 +277,7 @@ iter_chunk:
                                usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x",
                                        va_start, &pa_start, size, flags);
                                err = iommu_map(pd->domain, va_start, pa_start,
-                                               size, flags, GFP_KERNEL);
+                                               size, flags, GFP_ATOMIC);
                                if (err) {
                                        usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",
                                                va_start, &pa_start, size, err);
@@ -294,7 +294,7 @@ iter_chunk:
                                usnic_dbg("va 0x%lx pa %pa size 0x%zx flags 0x%x\n",
                                        va_start, &pa_start, size, flags);
                                err = iommu_map(pd->domain, va_start, pa_start,
-                                               size, flags, GFP_KERNEL);
+                                               size, flags, GFP_ATOMIC);
                                if (err) {
                                        usnic_err("Failed to map va 0x%lx pa %pa size 0x%zx with err %d\n",
                                                va_start, &pa_start, size, err);