memblock-drop-memblock_free_early_nid-and-memblock_free_early.patch removed from -mm tree
The patch titled
Subject: memblock: drop memblock_free_early_nid() and memblock_free_early()
has been removed from the -mm tree. Its filename was
memblock-drop-memblock_free_early_nid-and-memblock_free_early.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: 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().
---
arch/mips/mm/init.c | 2 +- arch/powerpc/platforms/pseries/svm.c | 3 +-- arch/s390/kernel/smp.c | 2 +- drivers/base/arch_numa.c | 2 +- drivers/s390/char/sclp_early.c | 2 +- include/linux/memblock.h | 12 ------------ kernel/dma/swiotlb.c | 2 +- lib/cpumask.c | 2 +- mm/percpu.c | 8 ++++---- mm/sparse.c | 2 +- 10 files changed, 12 insertions(+), 25 deletions(-)
arch/mips/mm/init.c renamed from arch/mips/mm/init.c~memblock-drop-memblock_free_early_nid-and-memblock_free_early +1 -1
@@ -529,7 +529,7 @@ static void * __init pcpu_fc_alloc(unsigstatic 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 )
arch/powerpc/platforms/pseries/svm.c renamed from arch/powerpc/platforms/pseries/svm.c~memblock-drop-memblock_free_early_nid-and-memblock_free_early +1 -2
@@ -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" ); }
arch/s390/kernel/smp.c renamed from arch/s390/kernel/smp.c~memblock-drop-memblock_free_early_nid-and-memblock_free_early +1 -1
@@ -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)); }/*
drivers/base/arch_numa.c renamed from drivers/base/arch_numa.c~memblock-drop-memblock_free_early_nid-and-memblock_free_early +1 -1
@@ -166,7 +166,7 @@ static void * __init pcpu_fc_alloc(unsigstatic 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
drivers/s390/char/sclp_early.c renamed from drivers/s390/char/sclp_early.c~memblock-drop-memblock_free_early_nid-and-memblock_free_early +1 -1
@@ -139,7 +139,7 @@ int __init sclp_early_get_core_info(stru }sclp_fill_core_info (info, sccb); out: -memblock_free_early ((unsigned long )sccb, length); +memblock_free ((unsigned long )sccb, length);return rc; }
include/linux/memblock.h renamed from include/linux/memblock.h~memblock-drop-memblock_free_early_nid-and-memblock_free_early +0 -12
@@ -441,18 +441,6 @@ static inline void *memblock_alloc_node( 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);
kernel/dma/swiotlb.c renamed from kernel/dma/swiotlb.c~memblock-drop-memblock_free_early_nid-and-memblock_free_early +1 -1
@@ -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" ); }
lib/cpumask.c renamed from lib/cpumask.c~memblock-drop-memblock_free_early_nid-and-memblock_free_early +1 -1
@@ -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
mm/percpu.c renamed from mm/percpu.c~memblock-drop-memblock_free_early_nid-and-memblock_free_early +4 -4
@@ -2472,7 +2472,7 @@ struct pcpu_alloc_info * __init pcpu_all*/ 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(ustatic 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 )
mm/sparse.c renamed from mm/sparse.c~memblock-drop-memblock_free_early_nid-and-memblock_free_early +1 -1
@@ -451,7 +451,7 @@ static void *sparsemap_buf_end __meminitstatic 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)
_
Patches currently in -mm which might be from [email protected] are