memblock: drop memblock_free_early_nid() and memblock_free_early()

memblock_free_early_nid() is unused and memblock_free_early() is an
alias for memblock_free().

Replace calls to memblock_free_early() with calls to memblock_free() and
remove memblock_free_early() and memblock_free_early_nid().

Link: https://lkml.kernel.org/r/20210930185031.18648-4-rppt@kernel.org
Signed-off-by: Mike Rapoport <rppt@linux.ibm.com>
Cc: Christophe Leroy <christophe.leroy@csgroup.eu>
Cc: Juergen Gross <jgross@suse.com>
Cc: Shahab Vahedi <Shahab.Vahedi@synopsys.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 19347dc..21a5a7a 100644 (file)
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -529,7 +529,7 @@ static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size,
 
 static void __init pcpu_fc_free(void *ptr, size_t size)
 {
-       memblock_free_early(__pa(ptr), size);
+       memblock_free(__pa(ptr), size);
 }
 
 void __init setup_per_cpu_areas(void)

diff --git a/arch/powerpc/platforms/pseries/svm.c b/arch/powerpc/platforms/pseries/svm.c
index 87f001b..f12229c 100644 (file)
--- a/arch/powerpc/platforms/pseries/svm.c
+++ b/arch/powerpc/platforms/pseries/svm.c
@@ -56,8 +56,7 @@ void __init svm_swiotlb_init(void)
                return;
 
 
-       memblock_free_early(__pa(vstart),
-                           PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));
+       memblock_free(__pa(vstart), PAGE_ALIGN(io_tlb_nslabs << IO_TLB_SHIFT));
        panic("SVM: Cannot allocate SWIOTLB buffer");
 }
 

diff --git a/arch/s390/kernel/smp.c b/arch/s390/kernel/smp.c
index 1a04e5b..066efd6 100644 (file)
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -880,7 +880,7 @@ void __init smp_detect_cpus(void)
 
        /* Add CPUs present at boot */
        __smp_rescan_cpus(info, true);
-       memblock_free_early((unsigned long)info, sizeof(*info));
+       memblock_free((unsigned long)info, sizeof(*info));
 }
 
 /*

diff --git a/drivers/base/arch_numa.c b/drivers/base/arch_numa.c
index a649167..ade8934 100644 (file)
--- a/drivers/base/arch_numa.c
+++ b/drivers/base/arch_numa.c
@@ -166,7 +166,7 @@ static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size,
 
 static void __init pcpu_fc_free(void *ptr, size_t size)
 {
-       memblock_free_early(__pa(ptr), size);
+       memblock_free(__pa(ptr), size);
 }
 
 #ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK

diff --git a/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c
index f3d5c7f..f01d942 100644 (file)
--- a/drivers/s390/char/sclp_early.c
+++ b/drivers/s390/char/sclp_early.c
@@ -139,7 +139,7 @@ int __init sclp_early_get_core_info(struct sclp_core_info *info)
        }
        sclp_fill_core_info(info, sccb);
 out:
-       memblock_free_early((unsigned long)sccb, length);
+       memblock_free((unsigned long)sccb, length);
        return rc;
 }
 

diff --git a/include/linux/memblock.h b/include/linux/memblock.h
index 34de69b..fc8183b 100644 (file)
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -441,18 +441,6 @@ static inline void *memblock_alloc_node(phys_addr_t size,
                                      MEMBLOCK_ALLOC_ACCESSIBLE, nid);
 }
 
-static inline void memblock_free_early(phys_addr_t base,
-                                             phys_addr_t size)
-{
-       memblock_free(base, size);
-}
-
-static inline void memblock_free_early_nid(phys_addr_t base,
-                                                 phys_addr_t size, int nid)
-{
-       memblock_free(base, size);
-}
-
 static inline void memblock_free_late(phys_addr_t base, phys_addr_t size)
 {
        __memblock_free_late(base, size);

diff --git a/kernel/dma/swiotlb.c b/kernel/dma/swiotlb.c
index 87c4051..430d2f7 100644 (file)
--- a/kernel/dma/swiotlb.c
+++ b/kernel/dma/swiotlb.c
@@ -247,7 +247,7 @@ swiotlb_init(int verbose)
        return;
 
 fail_free_mem:
-       memblock_free_early(__pa(tlb), bytes);
+       memblock_free(__pa(tlb), bytes);
 fail:
        pr_warn("Cannot allocate buffer");
 }

diff --git a/lib/cpumask.c b/lib/cpumask.c
index c3c76b8..0457794 100644 (file)
--- a/lib/cpumask.c
+++ b/lib/cpumask.c
@@ -188,7 +188,7 @@ EXPORT_SYMBOL(free_cpumask_var);
  */
 void __init free_bootmem_cpumask_var(cpumask_var_t mask)
 {
-       memblock_free_early(__pa(mask), cpumask_size());
+       memblock_free(__pa(mask), cpumask_size());
 }
 #endif
 

diff --git a/mm/percpu.c b/mm/percpu.c
index e0a9868..f58318c 100644 (file)
--- a/mm/percpu.c
+++ b/mm/percpu.c
@@ -2472,7 +2472,7 @@ struct pcpu_alloc_info * __init pcpu_alloc_alloc_info(int nr_groups,
  */
 void __init pcpu_free_alloc_info(struct pcpu_alloc_info *ai)
 {
-       memblock_free_early(__pa(ai), ai->__ai_size);
+       memblock_free(__pa(ai), ai->__ai_size);
 }
 
 /**
@@ -3134,7 +3134,7 @@ out_free_areas:
 out_free:
        pcpu_free_alloc_info(ai);
        if (areas)
-               memblock_free_early(__pa(areas), areas_size);
+               memblock_free(__pa(areas), areas_size);
        return rc;
 }
 #endif /* BUILD_EMBED_FIRST_CHUNK */
@@ -3256,7 +3256,7 @@ enomem:
                free_fn(page_address(pages[j]), PAGE_SIZE);
        rc = -ENOMEM;
 out_free_ar:
-       memblock_free_early(__pa(pages), pages_size);
+       memblock_free(__pa(pages), pages_size);
        pcpu_free_alloc_info(ai);
        return rc;
 }
@@ -3286,7 +3286,7 @@ static void * __init pcpu_dfl_fc_alloc(unsigned int cpu, size_t size,
 
 static void __init pcpu_dfl_fc_free(void *ptr, size_t size)
 {
-       memblock_free_early(__pa(ptr), size);
+       memblock_free(__pa(ptr), size);
 }
 
 void __init setup_per_cpu_areas(void)

diff --git a/mm/sparse.c b/mm/sparse.c
index 120bc8e..55fea0c 100644 (file)
--- a/mm/sparse.c
+++ b/mm/sparse.c
@@ -451,7 +451,7 @@ static void *sparsemap_buf_end __meminitdata;
 static inline void __meminit sparse_buffer_free(unsigned long size)
 {
        WARN_ON(!sparsemap_buf || size == 0);
-       memblock_free_early(__pa(sparsemap_buf), size);
+       memblock_free(__pa(sparsemap_buf), size);
 }
 
 static void __init sparse_buffer_init(unsigned long size, int nid)