memblock: drop memblock_free_early_nid() and memblock_free_early()

[ Upstream commit fa27717110ae51b9b9013ced0b5143888257bb79 ]

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>
Stable-dep-of: 29091a52562b ("of: reserved-memory: Do not make kmemleak ignore freed address")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/arch/mips/mm/init.c b/arch/mips/mm/init.c
index 833fcfc20b103f3241e808e29dbc33b901409498..81fda8c583ae16b2bb8f899b7254cc3d2ec777ab 100644 (file)
--- a/arch/mips/mm/init.c
+++ b/arch/mips/mm/init.c
@@ -527,7 +527,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 87f001b4c4e4fa338adb323c141b9c4c0e04c02b..f12229ce7301497567ace03b0cb000c133d6cbb2 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 48f67a69d119b3c2917a089162c33800b9b1f1ee..5c1fd147591cba2bd65c1b2225ee9e879159afe3 100644 (file)
--- a/arch/s390/kernel/smp.c
+++ b/arch/s390/kernel/smp.c
@@ -875,7 +875,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 bce0902dccb40edbe8d4c7f39a9be1937b494d35..6d4a95584714063876c15bffd4e65c7eb7664a25 100644 (file)
--- a/drivers/base/arch_numa.c
+++ b/drivers/base/arch_numa.c
@@ -165,7 +165,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/drivers/s390/char/sclp_early.c b/drivers/s390/char/sclp_early.c
index f3d5c7f4c13d29aa48be077cc9e03456316cdb1a..f01d942e1c1df0f6547dee0c8999b6db79b95246 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 307cab05d67ec54801a3287fd3431044f0f433b3..41f95cf22cb81e0aced4b1ce9b523893744e6512 100644 (file)
--- a/include/linux/memblock.h
+++ b/include/linux/memblock.h
@@ -442,18 +442,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 5c7ed5d5194247ebab24e0fc5336a599a0fc9631..59d44d8f6161dabb9d3de72514fc9f29606594c6 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 c3c76b833384686e43f0b9389874625ebf30709b..045779446a18d741138a807ab68c8b2a897a458f 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 e0a986818903dc7cc4b49b2f54749c24a636ff85..f58318cb04c02ab5646398c891c5e1241833199e 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 27092badd15bd106c8bb8683b0ceddaa51c29618..df9f8459043ef9cc3dd8d210f6036e577c436291 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)