Merge tag 'dma-mapping-6.6-2023-08-29' of git://git.infradead.org/users/hch/dma-mapping

[platform/kernel/linux-rpi.git] / mm / cma.c

diff --git a/mm/cma.c b/mm/cma.c
index 4880f72..da2967c 100644 (file)
--- a/mm/cma.c
+++ b/mm/cma.c
@@ -267,6 +267,9 @@ int __init cma_declare_contiguous_nid(phys_addr_t base,
        if (alignment && !is_power_of_2(alignment))
                return -EINVAL;
 
+       if (!IS_ENABLED(CONFIG_NUMA))
+               nid = NUMA_NO_NODE;
+
        /* Sanitise input arguments. */
        alignment = max_t(phys_addr_t, alignment, CMA_MIN_ALIGNMENT_BYTES);
        if (fixed && base & (alignment - 1)) {
@@ -372,14 +375,15 @@ int __init cma_declare_contiguous_nid(phys_addr_t base,
        if (ret)
                goto free_mem;
 
-       pr_info("Reserved %ld MiB at %pa\n", (unsigned long)size / SZ_1M,
-               &base);
+       pr_info("Reserved %ld MiB at %pa on node %d\n", (unsigned long)size / SZ_1M,
+               &base, nid);
        return 0;
 
 free_mem:
        memblock_phys_free(base, size);
 err:
-       pr_err("Failed to reserve %ld MiB\n", (unsigned long)size / SZ_1M);
+       pr_err("Failed to reserve %ld MiB on node %d\n", (unsigned long)size / SZ_1M,
+              nid);
        return ret;
 }