memblock-use-memblock_free-for-freeing-virtual-pointers.patch removed from -mm tree
The patch titled
Subject: memblock: use memblock_free for freeing virtual pointers
has been removed from the -mm tree. Its filename was
memblock-use-memblock_free-for-freeing-virtual-pointers.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: memblock: use memblock_free for freeing virtual pointers
Rename memblock_free_ptr() to memblock_free() and use memblock_free() when freeing a virtual pointer so that memblock_free() will be a counterpart of memblock_alloc()
The callers are updated with the below semantic patch and manual addition of (void *) casting to pointers that are represented by unsigned long variables.
@@
identifier vaddr;
expression size;
@@
(
- memblock_phys_free(__pa(vaddr), size);
+ memblock_free(vaddr, size);
|
- memblock_free_ptr(vaddr, size);
+ memblock_free(vaddr, size);
)
---
arch/alpha/kernel/core_irongate.c | 3 +-- arch/mips/mm/init.c | 2 +- arch/powerpc/kernel/dt_cpu_ftrs.c | 4 ++-- arch/powerpc/kernel/setup-common.c | 2 +- arch/powerpc/kernel/setup_64.c | 2 +- arch/powerpc/platforms/powernv/pci-ioda.c | 2 +- arch/powerpc/platforms/pseries/svm.c | 3 +-- arch/riscv/kernel/setup.c | 5 ++--- arch/sparc/kernel/smp_64.c | 2 +- arch/um/kernel/mem.c | 2 +- arch/x86/kernel/setup_percpu.c | 2 +- arch/x86/mm/kasan_init_64.c | 4 ++-- arch/x86/mm/numa.c | 2 +- arch/x86/mm/numa_emulation.c | 2 +- arch/x86/xen/mmu_pv.c | 2 +- arch/x86/xen/p2m.c | 2 +- drivers/base/arch_numa.c | 4 ++-- drivers/macintosh/smu.c | 2 +- drivers/xen/swiotlb-xen.c | 2 +- include/linux/memblock.h | 2 +- init/initramfs.c | 2 +- init/main.c | 4 ++-- kernel/dma/swiotlb.c | 2 +- kernel/printk/printk.c | 4 ++-- lib/bootconfig.c | 2 +- lib/cpumask.c | 2 +- mm/memblock.c | 6 +++--- mm/percpu.c | 8 ++++---- mm/sparse.c | 2 +- 29 files changed, 40 insertions(+), 43 deletions(-)
arch/alpha/kernel/core_irongate.c renamed from arch/alpha/kernel/core_irongate.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -2
@@ -233,8 +233,7 @@ albacore_init_arch(void)unsigned long size; size = initrd_end - initrd_start; -memblock_phys_free (__pa (initrd_start), -PAGE_ALIGN (size)); +memblock_free ((void *)initrd_start,PAGE_ALIGN (size));if (!move_initrd (pci_mem)) printk("irongate_init_arch: initrd too big " "(%ldK)\ndisabling initrd\n",
arch/mips/mm/init.c renamed from arch/mips/mm/init.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -529,7 +529,7 @@ static void * __init pcpu_fc_alloc(unsigstatic void __init pcpu_fc_free (void *ptr,size_t size) { -memblock_phys_free (__pa (ptr), size); +memblock_free (ptr, size); }void __init setup_per_cpu_areas (void )
arch/powerpc/kernel/dt_cpu_ftrs.c renamed from arch/powerpc/kernel/dt_cpu_ftrs.c~memblock-use-memblock_free-for-freeing-virtual-pointers +2 -2
@@ -1095,8 +1095,8 @@ static int __init dt_cpu_ftrs_scan_callbcpufeatures_setup_finished (); -memblock_phys_free (__pa (dt_cpu_features), -sizeof (struct dt_cpu_feature ) * nr_dt_cpu_features); +memblock_free (dt_cpu_features, +sizeof (struct dt_cpu_feature ) * nr_dt_cpu_features);return 0 ; }
arch/powerpc/kernel/setup_64.c renamed from arch/powerpc/kernel/setup_64.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -812,7 +812,7 @@ static void * __init pcpu_alloc_bootmem(static void __init pcpu_free_bootmem (void *ptr,size_t size) { -memblock_phys_free (__pa (ptr), size); +memblock_free (ptr, size); }static int pcpu_cpu_distance (unsigned int from,unsigned int to)
arch/powerpc/kernel/setup-common.c renamed from arch/powerpc/kernel/setup-common.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -825,7 +825,7 @@ static void __init smp_setup_pacas(void) set_hard_smp_processor_id(cpu, cpu_to_phys_id[cpu]); } -memblock_phys_free (__pa (cpu_to_phys_id), nr_cpu_ids *sizeof (u32)); +memblock_free (cpu_to_phys_id, nr_cpu_ids *sizeof (u32)); cpu_to_phys_id =NULL ; }#endif
arch/powerpc/platforms/powernv/pci-ioda.c renamed from arch/powerpc/platforms/powernv/pci-ioda.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -2981,7 +2981,7 @@ static void __init pnv_pci_init_ioda_phbif (!phb->hose) {pr_err (" Can't allocate PCI controller for %pOF\n" , np); -memblock_phys_free (__pa (phb),sizeof (struct pnv_phb )); +memblock_free (phb,sizeof (struct pnv_phb ));return ; }
arch/powerpc/platforms/pseries/svm.c renamed from arch/powerpc/platforms/pseries/svm.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -2
@@ -56,8 +56,7 @@ void __init svm_swiotlb_init(void)return ; -memblock_phys_free (__pa (vstart), -PAGE_ALIGN (io_tlb_nslabs <<IO_TLB_SHIFT )); +memblock_free (vstart,PAGE_ALIGN (io_tlb_nslabs <<IO_TLB_SHIFT ));panic ("SVM: Cannot allocate SWIOTLB buffer" ); }
arch/riscv/kernel/setup.c renamed from arch/riscv/kernel/setup.c~memblock-use-memblock_free-for-freeing-virtual-pointers +2 -3
@@ -230,14 +230,13 @@ static void __init init_resources(void)/* Clean-up any unused pre-allocated resources */ if (res_idx >=0 ) -memblock_phys_free (__pa (mem_res), - (res_idx +1 ) *sizeof (*mem_res)); +memblock_free (mem_res, (res_idx +1 ) *sizeof (*mem_res));return ; error:/* Better an empty resource tree than an inconsistent one */ release_child_resources (&iomem_resource); -memblock_phys_free (__pa (mem_res), mem_res_sz); +memblock_free (mem_res, mem_res_sz); }
arch/sparc/kernel/smp_64.c renamed from arch/sparc/kernel/smp_64.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -1567,7 +1567,7 @@ static void * __init pcpu_alloc_bootmem(static void __init pcpu_free_bootmem (void *ptr,size_t size) { -memblock_phys_free (__pa (ptr), size); +memblock_free (ptr, size); }static int __init pcpu_cpu_distance (unsigned int from,unsigned int to)
arch/um/kernel/mem.c renamed from arch/um/kernel/mem.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -47,7 +47,7 @@ void __init mem_init(void)*/ brk_end = (unsigned long )UML_ROUND_UP (sbrk (0 ));map_memory (brk_end,__pa (brk_end), uml_reserved - brk_end,1 ,1 ,0 ); -memblock_phys_free (__pa (brk_end), uml_reserved - brk_end); +memblock_free ((void *)brk_end, uml_reserved - brk_end); uml_reserved = brk_end;/* this will put all low memory onto the freelists */
arch/x86/kernel/setup_percpu.c renamed from arch/x86/kernel/setup_percpu.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -135,7 +135,7 @@ static void * __init pcpu_fc_alloc(unsigstatic void __init pcpu_fc_free (void *ptr,size_t size) { -memblock_free_ptr (ptr, size); +memblock_free (ptr, size); }static int __init pcpu_cpu_distance (unsigned int from,unsigned int to)
arch/x86/mm/kasan_init_64.c renamed from arch/x86/mm/kasan_init_64.c~memblock-use-memblock_free-for-freeing-virtual-pointers +2 -2
@@ -49,7 +49,7 @@ static void __init kasan_populate_pmd(pm p =early_alloc (PMD_SIZE , nid, false);if (p &&pmd_set_huge (pmd,__pa (p),PAGE_KERNEL ))return ; -memblock_free_ptr (p,PMD_SIZE ); +memblock_free (p,PMD_SIZE ); } p =early_alloc (PAGE_SIZE , nid, true);
@@ -85,7 +85,7 @@ static void __init kasan_populate_pud(pu p =early_alloc (PUD_SIZE , nid, false);if (p &&pud_set_huge (pud,__pa (p),PAGE_KERNEL ))return ; -memblock_free_ptr (p,PUD_SIZE ); +memblock_free (p,PUD_SIZE ); } p =early_alloc (PAGE_SIZE , nid, true);
arch/x86/mm/numa.c renamed from arch/x86/mm/numa.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -355,7 +355,7 @@ void __init numa_reset_distance(void)/* numa_distance could be 1LU marking allocation failure, test cnt */ if (numa_distance_cnt) -memblock_free_ptr (numa_distance, size); +memblock_free (numa_distance, size); numa_distance_cnt =0 ; numa_distance =NULL ;/* enable table creation */ }
arch/x86/mm/numa_emulation.c renamed from arch/x86/mm/numa_emulation.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -517,7 +517,7 @@ void __init numa_emulation(struct numa_m }/* free the copied physical distance table */ -memblock_free_ptr (phys_dist, phys_size); +memblock_free (phys_dist, phys_size);return ; no_emu:
arch/x86/xen/mmu_pv.c renamed from arch/x86/xen/mmu_pv.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -1151,7 +1151,7 @@ static void __init xen_pagetable_p2m_frexen_cleanhighmap (addr, addr + size); size =PAGE_ALIGN (xen_start_info->nr_pages *sizeof (unsigned long )); -memblock_phys_free (__pa (addr), size); +memblock_free ((void *)addr, size); }else {xen_cleanmfnmap (addr); }
arch/x86/xen/p2m.c renamed from arch/x86/xen/p2m.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -197,7 +197,7 @@ static void * __ref alloc_p2m_page(void)static void __ref free_p2m_page (void *p) {if (unlikely (!slab_is_available ())) { -memblock_free_ptr (p,PAGE_SIZE ); +memblock_free (p,PAGE_SIZE );return ; }
drivers/base/arch_numa.c renamed from drivers/base/arch_numa.c~memblock-use-memblock_free-for-freeing-virtual-pointers +2 -2
@@ -166,7 +166,7 @@ static void * __init pcpu_fc_alloc(unsigstatic void __init pcpu_fc_free (void *ptr,size_t size) { -memblock_phys_free (__pa (ptr), size); +memblock_free (ptr, size); }#ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK
@@ -326,7 +326,7 @@ void __init numa_free_distance(void) size = numa_distance_cnt * numa_distance_cnt *sizeof (numa_distance[0 ]); -memblock_free_ptr (numa_distance, size); +memblock_free (numa_distance, size); numa_distance_cnt =0 ; numa_distance =NULL ; }
drivers/macintosh/smu.c renamed from drivers/macintosh/smu.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -570,7 +570,7 @@ fail_msg_node: fail_db_node:of_node_put (smu->db_node); fail_bootmem: -memblock_free_ptr (smu,sizeof (struct smu_device )); +memblock_free (smu,sizeof (struct smu_device )); smu =NULL ; fail_np:of_node_put (np);
drivers/xen/swiotlb-xen.c renamed from drivers/xen/swiotlb-xen.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -241,7 +241,7 @@ retry:*/ rc =xen_swiotlb_fixup (start, nslabs);if (rc) { -memblock_phys_free (__pa (start),PAGE_ALIGN (bytes)); +memblock_free (start,PAGE_ALIGN (bytes));if (nslabs >1024 && repeat--) {/* Min is 2MB */ nslabs =max (1024UL ,ALIGN (nslabs >>1 ,IO_TLB_SEGSIZE ));
include/linux/memblock.h renamed from include/linux/memblock.h~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -118,7 +118,7 @@ int memblock_mark_nomap(phys_addr_t baseint memblock_clear_nomap (phys_addr_t base,phys_addr_t size);void memblock_free_all (void ); -void memblock_free_ptr (void *ptr,size_t size); +void memblock_free (void *ptr,size_t size);void reset_node_managed_pages (pg_data_t *pgdat);void reset_all_zones_managed_pages (void );
init/initramfs.c renamed from init/initramfs.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -607,7 +607,7 @@ void __weak __init free_initrd_mem(unsigunsigned long aligned_start =ALIGN_DOWN (start,PAGE_SIZE );unsigned long aligned_end =ALIGN (end,PAGE_SIZE ); -memblock_phys_free (__pa (aligned_start), aligned_end - aligned_start); +memblock_free ((void *)aligned_start, aligned_end - aligned_start);#endif free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
init/main.c renamed from init/main.c~memblock-use-memblock_free-for-freeing-virtual-pointers +2 -2
@@ -382,7 +382,7 @@ static char * __init xbc_make_cmdline(co ret =xbc_snprint_cmdline (new_cmdline, len +1 , root);if (ret <0 || ret > len) {pr_err ("Failed to print extra kernel cmdline.\n" ); -memblock_free_ptr (new_cmdline, len +1 ); +memblock_free (new_cmdline, len +1 );return NULL ; }
@@ -925,7 +925,7 @@ static void __init print_unknown_bootopt end +=sprintf (end," %s" , *p);pr_notice ("Unknown command line parameters:%s\n" , unknown_options); -memblock_free_ptr (unknown_options, len); +memblock_free (unknown_options, len); } asmlinkage __visible void __init __no_sanitize_address start_kernel(void)
kernel/dma/swiotlb.c renamed from kernel/dma/swiotlb.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -247,7 +247,7 @@ swiotlb_init(int verbose)return ; fail_free_mem: -memblock_phys_free (__pa (tlb), bytes); +memblock_free (tlb, bytes); fail:pr_warn ("Cannot allocate buffer" ); }
kernel/printk/printk.c renamed from kernel/printk/printk.c~memblock-use-memblock_free-for-freeing-virtual-pointers +2 -2
@@ -1166,9 +1166,9 @@ void __init setup_log_buf(int early)return ; err_free_descs: -memblock_free_ptr (new_descs, new_descs_size); +memblock_free (new_descs, new_descs_size); err_free_log_buf: -memblock_free_ptr (new_log_buf, new_log_buf_len); +memblock_free (new_log_buf, new_log_buf_len); }static bool __read_mostly ignore_loglevel;
lib/bootconfig.c renamed from lib/bootconfig.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -792,7 +792,7 @@ void __init xbc_destroy_all(void) xbc_data =NULL ; xbc_data_size =0 ; xbc_node_num =0 ; -memblock_free_ptr (xbc_nodes,sizeof (struct xbc_node ) *XBC_NODE_MAX ); +memblock_free (xbc_nodes,sizeof (struct xbc_node ) *XBC_NODE_MAX ); xbc_nodes =NULL ; brace_index =0 ; }
lib/cpumask.c renamed from lib/cpumask.c~memblock-use-memblock_free-for-freeing-virtual-pointers +1 -1
@@ -188,7 +188,7 @@ EXPORT_SYMBOL(free_cpumask_var);*/ void __init free_bootmem_cpumask_var (cpumask_var_t mask) { -memblock_phys_free (__pa (mask),cpumask_size ()); +memblock_free (mask,cpumask_size ()); }#endif
mm/memblock.c renamed from mm/memblock.c~memblock-use-memblock_free-for-freeing-virtual-pointers +3 -3
@@ -472,7 +472,7 @@ static int __init_memblock memblock_doubkfree (old_array); else if (old_array != memblock_memory_init_regions && old_array != memblock_reserved_init_regions) - memblock_free_ptr(old_array, old_alloc_size); + memblock_free(old_array, old_alloc_size);/* * Reserve the new array if that comes from the memblock. Otherwise, we
@@ -796,14 +796,14 @@ int __init_memblock memblock_remove(phys }/** -* memblock_free_ptr - free boot memory allocation +* memblock_free - free boot memory allocation * @ptr: starting address of the boot memory allocation * @size: size of the boot memory block in bytes * * Free boot memory block previously allocated by memblock_alloc_xx() API. * The freeing memory will not be released to the buddy allocator. */ -void __init_memblock memblock_free_ptr(void *ptr, size_t size) +void __init_memblock memblock_free(void *ptr, size_t size) {if (ptr)memblock_phys_free (__pa (ptr), size);
mm/percpu.c renamed from mm/percpu.c~memblock-use-memblock_free-for-freeing-virtual-pointers +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_phys_free (__pa (ai), ai->__ai_size); +memblock_free (ai, ai->__ai_size); }/**
@@ -3134,7 +3134,7 @@ out_free_areas: out_free:pcpu_free_alloc_info (ai);if (areas) -memblock_phys_free (__pa (areas), areas_size); +memblock_free (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_phys_free (__pa (pages), pages_size); +memblock_free (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_phys_free (__pa (ptr), size); +memblock_free (ptr, size); }void __init setup_per_cpu_areas (void )
mm/sparse.c renamed from mm/sparse.c~memblock-use-memblock_free-for-freeing-virtual-pointers +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_phys_free (__pa (sparsemap_buf), size); +memblock_free (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