memblock-rename-memblock_free-to-memblock_phys_free.patch removed from -mm tree
The patch titled
Subject: memblock: rename memblock_free to memblock_phys_free
has been removed from the -mm tree. Its filename was
memblock-rename-memblock_free-to-memblock_phys_free.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
From: Mike Rapoport <[email protected]>
Subject: memblock: rename memblock_free to memblock_phys_free
Since memblock_free() operates on a physical range, make its name reflect it and rename it to memblock_phys_free(), so it will be a logical counterpart to memblock_phys_alloc().
The callers are updated with the below semantic patch:
@@
expression addr;
expression size;
@@
- memblock_free(addr, size);
+ memblock_phys_free(addr, size);
---
arch/alpha/kernel/core_irongate.c | 3 ++- arch/arc/mm/init.c | 2 +- arch/arm/mach-hisi/platmcpm.c | 2 +- arch/arm/mm/init.c | 2 +- arch/arm64/mm/mmu.c | 4 ++-- arch/mips/mm/init.c | 2 +- arch/mips/sgi-ip30/ip30-setup.c | 6 +++--- arch/powerpc/kernel/dt_cpu_ftrs.c | 4 ++-- arch/powerpc/kernel/paca.c | 8 ++++---- 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/s390/kernel/setup.c | 8 ++++---- arch/s390/kernel/smp.c | 4 ++-- arch/s390/kernel/uv.c | 2 +- arch/s390/mm/kasan_init.c | 2 +- arch/sh/boards/mach-ap325rxa/setup.c | 2 +- arch/sh/boards/mach-ecovec24/setup.c | 4 ++-- arch/sh/boards/mach-kfr2r09/setup.c | 2 +- arch/sh/boards/mach-migor/setup.c | 2 +- arch/sh/boards/mach-se/7724/setup.c | 4 ++-- arch/sparc/kernel/smp_64.c | 2 +- arch/um/kernel/mem.c | 2 +- arch/x86/kernel/setup.c | 4 ++-- arch/x86/mm/init.c | 2 +- arch/x86/xen/mmu_pv.c | 6 +++--- arch/x86/xen/setup.c | 6 +++--- drivers/base/arch_numa.c | 2 +- drivers/firmware/efi/memmap.c | 2 +- drivers/of/kexec.c | 3 +-- drivers/of/of_reserved_mem.c | 5 +++-- drivers/s390/char/sclp_early.c | 2 +- drivers/usb/early/xhci-dbc.c | 10 +++++----- drivers/xen/swiotlb-xen.c | 2 +- include/linux/memblock.h | 2 +- init/initramfs.c | 2 +- kernel/dma/swiotlb.c | 2 +- lib/cpumask.c | 2 +- mm/cma.c | 2 +- mm/memblock.c | 8 ++++---- mm/memory_hotplug.c | 2 +- mm/percpu.c | 8 ++++---- mm/sparse.c | 2 +- 45 files changed, 79 insertions(+), 76 deletions(-)
arch/alpha/kernel/core_irongate.c renamed from arch/alpha/kernel/core_irongate.c~memblock-rename-memblock_free-to-memblock_phys_free +2 -1
@@ -233,7 +233,8 @@ albacore_init_arch(void)unsigned long size; size = initrd_end - initrd_start; -memblock_free (__pa (initrd_start),PAGE_ALIGN (size)); +memblock_phys_free (__pa (initrd_start), +PAGE_ALIGN (size));if (!move_initrd (pci_mem)) printk("irongate_init_arch: initrd too big " "(%ldK)\ndisabling initrd\n",
arch/arc/mm/init.c renamed from arch/arc/mm/init.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -173,7 +173,7 @@ static void __init highmem_init(void)#ifdef CONFIG_HIGHMEM unsigned long tmp; -memblock_free (high_mem_start, high_mem_sz); +memblock_phys_free (high_mem_start, high_mem_sz);for (tmp = min_high_pfn; tmp < max_high_pfn; tmp++)free_highmem_page (pfn_to_page (tmp));#endif
arch/arm64/mm/mmu.c renamed from arch/arm64/mm/mmu.c~memblock-rename-memblock_free-to-memblock_phys_free +2 -2
@@ -738,8 +738,8 @@ void __init paging_init(void)cpu_replace_ttbr1 (lm_alias (swapper_pg_dir)); init_mm.pgd = swapper_pg_dir; -memblock_free (__pa_symbol (init_pg_dir), -__pa_symbol (init_pg_end) -__pa_symbol (init_pg_dir)); +memblock_phys_free (__pa_symbol (init_pg_dir), +__pa_symbol (init_pg_end) -__pa_symbol (init_pg_dir));memblock_allow_resize (); }
arch/arm/mach-hisi/platmcpm.c renamed from arch/arm/mach-hisi/platmcpm.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -339,7 +339,7 @@ err_fabric: err_sysctrl:iounmap (relocation); err_reloc: -memblock_free (hip04_boot_method[0 ], hip04_boot_method[1 ]); +memblock_phys_free (hip04_boot_method[0 ], hip04_boot_method[1 ]); err:return ret; }
arch/arm/mm/init.c renamed from arch/arm/mm/init.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -158,7 +158,7 @@ phys_addr_t __init arm_memblock_steal(phpanic ("Failed to steal %pa bytes at %pS\n" , &size, (void *)_RET_IP_); -memblock_free (phys, size); +memblock_phys_free (phys, size);memblock_remove (phys, size);return phys;
arch/mips/mm/init.c renamed from arch/mips/mm/init.c~memblock-rename-memblock_free-to-memblock_phys_free +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 (__pa (ptr), size); +memblock_phys_free (__pa (ptr), size); }void __init setup_per_cpu_areas (void )
arch/mips/sgi-ip30/ip30-setup.c renamed from arch/mips/sgi-ip30/ip30-setup.c~memblock-rename-memblock_free-to-memblock_phys_free +3 -3
@@ -69,10 +69,10 @@ static void __init ip30_mem_init(void) total_mem += size;if (addr >=IP30_REAL_MEMORY_START ) -memblock_free (addr, size); +memblock_phys_free (addr, size);else if ((addr + size) >IP30_REAL_MEMORY_START ) -memblock_free (IP30_REAL_MEMORY_START , - size -IP30_MAX_PROM_MEMORY ); +memblock_phys_free (IP30_REAL_MEMORY_START , + size -IP30_MAX_PROM_MEMORY ); }pr_info ("Detected %luMB of physical memory.\n" ,MEM_SHIFT (total_mem)); }
arch/powerpc/kernel/dt_cpu_ftrs.c renamed from arch/powerpc/kernel/dt_cpu_ftrs.c~memblock-rename-memblock_free-to-memblock_phys_free +2 -2
@@ -1095,8 +1095,8 @@ static int __init dt_cpu_ftrs_scan_callbcpufeatures_setup_finished (); -memblock_free (__pa (dt_cpu_features), -sizeof (struct dt_cpu_feature )*nr_dt_cpu_features); +memblock_phys_free (__pa (dt_cpu_features), +sizeof (struct dt_cpu_feature ) * nr_dt_cpu_features);return 0 ; }
arch/powerpc/kernel/paca.c renamed from arch/powerpc/kernel/paca.c~memblock-rename-memblock_free-to-memblock_phys_free +4 -4
@@ -322,8 +322,8 @@ void __init free_unused_pacas(void) new_ptrs_size =sizeof (struct paca_struct *) * nr_cpu_ids;if (new_ptrs_size < paca_ptrs_size) -memblock_free (__pa (paca_ptrs) + new_ptrs_size, - paca_ptrs_size - new_ptrs_size); +memblock_phys_free (__pa (paca_ptrs) + new_ptrs_size, + paca_ptrs_size - new_ptrs_size); paca_nr_cpu_ids = nr_cpu_ids; paca_ptrs_size = new_ptrs_size;
@@ -331,8 +331,8 @@ void __init free_unused_pacas(void)#ifdef CONFIG_PPC_BOOK3S_64 if (early_radix_enabled ()) {/* Ugly fixup, see new_slb_shadow() */ -memblock_free (__pa (paca_ptrs[boot_cpuid]->slb_shadow_ptr), -sizeof (struct slb_shadow )); +memblock_phys_free (__pa (paca_ptrs[boot_cpuid]->slb_shadow_ptr), +sizeof (struct slb_shadow )); paca_ptrs[boot_cpuid]->slb_shadow_ptr =NULL ; }#endif
arch/powerpc/kernel/setup_64.c renamed from arch/powerpc/kernel/setup_64.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -812,7 +812,7 @@ static void * __init pcpu_alloc_bootmem(static void __init pcpu_free_bootmem (void *ptr,size_t size) { -memblock_free (__pa (ptr), size); +memblock_phys_free (__pa (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-rename-memblock_free-to-memblock_phys_free +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_free (__pa (cpu_to_phys_id), nr_cpu_ids *sizeof (u32)); +memblock_phys_free (__pa (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-rename-memblock_free-to-memblock_phys_free +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_free (__pa (phb),sizeof (struct pnv_phb )); +memblock_phys_free (__pa (phb),sizeof (struct pnv_phb ));return ; }
arch/powerpc/platforms/pseries/svm.c renamed from arch/powerpc/platforms/pseries/svm.c~memblock-rename-memblock_free-to-memblock_phys_free +2 -1
@@ -56,7 +56,8 @@ void __init svm_swiotlb_init(void)return ; -memblock_free (__pa (vstart),PAGE_ALIGN (io_tlb_nslabs <<IO_TLB_SHIFT )); +memblock_phys_free (__pa (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-rename-memblock_free-to-memblock_phys_free +3 -2
@@ -230,13 +230,14 @@ static void __init init_resources(void)/* Clean-up any unused pre-allocated resources */ if (res_idx >=0 ) -memblock_free (__pa (mem_res), (res_idx +1 ) *sizeof (*mem_res)); +memblock_phys_free (__pa (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_free (__pa (mem_res), mem_res_sz); +memblock_phys_free (__pa (mem_res), mem_res_sz); }
arch/s390/kernel/setup.c renamed from arch/s390/kernel/setup.c~memblock-rename-memblock_free-to-memblock_phys_free +4 -4
@@ -693,7 +693,7 @@ static void __init reserve_crashkernel(v }if (register_memory_notifier (&kdump_mem_nb)) { -memblock_free (crash_base, crash_size); +memblock_phys_free (crash_base, crash_size);return ; }
@@ -748,7 +748,7 @@ static void __init free_mem_detect_info(get_mem_detect_reserved (&start, &size);if (size) -memblock_free (start, size); +memblock_phys_free (start, size); }static const char *__init get_mem_info_source (void )
@@ -793,7 +793,7 @@ static void __init check_initrd(void)if (initrd_data.start && initrd_data.size && !memblock_is_region_memory (initrd_data.start, initrd_data.size)) {pr_err ("The initial RAM disk does not fit into the memory\n" ); -memblock_free (initrd_data.start, initrd_data.size); +memblock_phys_free (initrd_data.start, initrd_data.size); initrd_start = initrd_end =0 ; }#endif
@@ -890,7 +890,7 @@ static void __init setup_randomness(voidif (stsi (vmms,3 ,2 ,2 ) ==0 && vmms->count)add_device_randomness (&vmms->vm,sizeof (vmms->vm[0 ]) * vmms->count); -memblock_free ((unsigned long ) vmms,PAGE_SIZE ); +memblock_phys_free ((unsigned long )vmms,PAGE_SIZE ); }/*
arch/s390/kernel/smp.c renamed from arch/s390/kernel/smp.c~memblock-rename-memblock_free-to-memblock_phys_free +2 -2
@@ -723,7 +723,7 @@ void __init smp_save_dump_cpus(void)/* Get the CPU registers */ smp_save_cpu_regs (sa, addr, is_boot_cpu, page); } -memblock_free (page,PAGE_SIZE ); +memblock_phys_free (page,PAGE_SIZE ); diag_amode31_ops.diag308_reset ();pcpu_set_smt (0 ); }
@@ -880,7 +880,7 @@ void __init smp_detect_cpus(void)/* Add CPUs present at boot */ __smp_rescan_cpus (info, true); -memblock_free ((unsigned long )info,sizeof (*info)); +memblock_phys_free ((unsigned long )info,sizeof (*info)); }/*
arch/s390/kernel/uv.c renamed from arch/s390/kernel/uv.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -64,7 +64,7 @@ void __init setup_uv(void) }if (uv_init (uv_stor_base, uv_info.uv_base_stor_len)) { -memblock_free (uv_stor_base, uv_info.uv_base_stor_len); +memblock_phys_free (uv_stor_base, uv_info.uv_base_stor_len); goto fail; }
arch/s390/mm/kasan_init.c renamed from arch/s390/mm/kasan_init.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -399,5 +399,5 @@ void __init kasan_copy_shadow_mapping(vovoid __init kasan_free_early_identity (void ) { -memblock_free (pgalloc_pos, pgalloc_freeable - pgalloc_pos); +memblock_phys_free (pgalloc_pos, pgalloc_freeable - pgalloc_pos); }
arch/sh/boards/mach-ap325rxa/setup.c renamed from arch/sh/boards/mach-ap325rxa/setup.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -560,7 +560,7 @@ static void __init ap325rxa_mv_mem_reserif (!phys)panic ("Failed to allocate CEU memory\n" ); -memblock_free (phys, size); +memblock_phys_free (phys, size);memblock_remove (phys, size); ceu_dma_membase = phys;
arch/sh/boards/mach-ecovec24/setup.c renamed from arch/sh/boards/mach-ecovec24/setup.c~memblock-rename-memblock_free-to-memblock_phys_free +2 -2
@@ -1502,7 +1502,7 @@ static void __init ecovec_mv_mem_reserveif (!phys)panic ("Failed to allocate CEU0 memory\n" ); -memblock_free (phys, size); +memblock_phys_free (phys, size);memblock_remove (phys, size); ceu0_dma_membase = phys;
@@ -1510,7 +1510,7 @@ static void __init ecovec_mv_mem_reserveif (!phys)panic ("Failed to allocate CEU1 memory\n" ); -memblock_free (phys, size); +memblock_phys_free (phys, size);memblock_remove (phys, size); ceu1_dma_membase = phys; }
arch/sh/boards/mach-kfr2r09/setup.c renamed from arch/sh/boards/mach-kfr2r09/setup.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -633,7 +633,7 @@ static void __init kfr2r09_mv_mem_reservif (!phys)panic ("Failed to allocate CEU memory\n" ); -memblock_free (phys, size); +memblock_phys_free (phys, size);memblock_remove (phys, size); ceu_dma_membase = phys;
arch/sh/boards/mach-migor/setup.c renamed from arch/sh/boards/mach-migor/setup.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -633,7 +633,7 @@ static void __init migor_mv_mem_reserve(if (!phys)panic ("Failed to allocate CEU memory\n" ); -memblock_free (phys, size); +memblock_phys_free (phys, size);memblock_remove (phys, size); ceu_dma_membase = phys;
arch/sh/boards/mach-se/7724/setup.c renamed from arch/sh/boards/mach-se/7724/setup.c~memblock-rename-memblock_free-to-memblock_phys_free +2 -2
@@ -966,7 +966,7 @@ static void __init ms7724se_mv_mem_reserif (!phys)panic ("Failed to allocate CEU0 memory\n" ); -memblock_free (phys, size); +memblock_phys_free (phys, size);memblock_remove (phys, size); ceu0_dma_membase = phys;
@@ -974,7 +974,7 @@ static void __init ms7724se_mv_mem_reserif (!phys)panic ("Failed to allocate CEU1 memory\n" ); -memblock_free (phys, size); +memblock_phys_free (phys, size);memblock_remove (phys, size); ceu1_dma_membase = phys; }
arch/sparc/kernel/smp_64.c renamed from arch/sparc/kernel/smp_64.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -1567,7 +1567,7 @@ static void * __init pcpu_alloc_bootmem(static void __init pcpu_free_bootmem (void *ptr,size_t size) { -memblock_free (__pa (ptr), size); +memblock_phys_free (__pa (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-rename-memblock_free-to-memblock_phys_free +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_free (__pa (brk_end), uml_reserved - brk_end); +memblock_phys_free (__pa (brk_end), uml_reserved - brk_end); uml_reserved = brk_end;/* this will put all low memory onto the freelists */
arch/x86/kernel/setup.c renamed from arch/x86/kernel/setup.c~memblock-rename-memblock_free-to-memblock_phys_free +2 -2
@@ -322,7 +322,7 @@ static void __init reserve_initrd(void)relocate_initrd (); - memblock_free(ramdisk_image, ramdisk_end - ramdisk_image); + memblock_phys_free(ramdisk_image, ramdisk_end - ramdisk_image); }#else
@@ -521,7 +521,7 @@ static void __init reserve_crashkernel(v }if (crash_base >= (1ULL <<32 ) &&reserve_crashkernel_low ()) { -memblock_free (crash_base, crash_size); +memblock_phys_free (crash_base, crash_size);return ; }
arch/x86/mm/init.c renamed from arch/x86/mm/init.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -618,7 +618,7 @@ static void __init memory_map_top_down(u*/ addr =memblock_phys_alloc_range (PMD_SIZE ,PMD_SIZE , map_start, map_end); -memblock_free (addr,PMD_SIZE ); +memblock_phys_free (addr,PMD_SIZE ); real_end = addr +PMD_SIZE ;/* step_size need to be small so pgt_buf from BRK could cover it */
arch/x86/xen/mmu_pv.c renamed from arch/x86/xen/mmu_pv.c~memblock-rename-memblock_free-to-memblock_phys_free +3 -3
@@ -1025,7 +1025,7 @@ static void __init xen_free_ro_pages(unsfor (; vaddr < vaddr_end; vaddr +=PAGE_SIZE )make_lowmem_page_readwrite (vaddr); -memblock_free (paddr, size); +memblock_phys_free (paddr, size); }static void __init xen_cleanmfnmap_free_pgtbl (void *pgtbl,bool unpin)
@@ -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_free (__pa (addr), size); +memblock_phys_free (__pa (addr), size); }else {xen_cleanmfnmap (addr); }
@@ -1955,7 +1955,7 @@ void __init xen_relocate_p2m(void) pfn_end = p2m_pfn_end; } -memblock_free (PFN_PHYS (pfn),PAGE_SIZE * (pfn_end - pfn)); +memblock_phys_free (PFN_PHYS (pfn),PAGE_SIZE * (pfn_end - pfn));while (pfn < pfn_end) {if (pfn == p2m_pfn) { pfn = p2m_pfn_end;
arch/x86/xen/setup.c renamed from arch/x86/xen/setup.c~memblock-rename-memblock_free-to-memblock_phys_free +3 -3
@@ -153,7 +153,7 @@ static void __init xen_del_extra_mem(unsbreak ; } } -memblock_free (PFN_PHYS (start_pfn),PFN_PHYS (n_pfns)); +memblock_phys_free (PFN_PHYS (start_pfn),PFN_PHYS (n_pfns)); }/*
@@ -719,7 +719,7 @@ static void __init xen_reserve_xen_mfnlireturn ;xen_relocate_p2m (); -memblock_free (start, size); +memblock_phys_free (start, size); }/**
@@ -885,7 +885,7 @@ char * __init xen_memory_setup(void)xen_phys_memcpy (new_area, start, size);pr_info ("initrd moved from [mem %#010llx-%#010llx] to [mem %#010llx-%#010llx]\n" , start, start + size, new_area, new_area + size); -memblock_free (start, size); +memblock_phys_free (start, size); boot_params.hdr.ramdisk_image = new_area; boot_params.ext_ramdisk_image = new_area >>32 ; }
drivers/base/arch_numa.c renamed from drivers/base/arch_numa.c~memblock-rename-memblock_free-to-memblock_phys_free +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 (__pa (ptr), size); +memblock_phys_free (__pa (ptr), size); }#ifdef CONFIG_NEED_PER_CPU_PAGE_FIRST_CHUNK
drivers/firmware/efi/memmap.c renamed from drivers/firmware/efi/memmap.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -35,7 +35,7 @@ void __init __efi_memmap_free(u64 phys,if (slab_is_available ())memblock_free_late (phys, size);else -memblock_free (phys, size); +memblock_phys_free (phys, size); }else if (flags &EFI_MEMMAP_SLAB ) {struct page *p =pfn_to_page (PHYS_PFN (phys));unsigned int order =get_order (size);
drivers/of/kexec.c renamed from drivers/of/kexec.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -2
@@ -171,8 +171,7 @@ int ima_free_kexec_buffer(void)if (ret)return ret; -return memblock_free (addr, size); - +return memblock_phys_free (addr, size); }/**
drivers/of/of_reserved_mem.c renamed from drivers/of/of_reserved_mem.c~memblock-rename-memblock_free-to-memblock_phys_free +3 -2
@@ -46,7 +46,7 @@ static int __init early_init_dt_alloc_reif (nomap) { err =memblock_mark_nomap (base, size);if (err) -memblock_free (base, size); +memblock_phys_free (base, size);kmemleak_ignore_phys (base); }
@@ -284,7 +284,8 @@ void __init fdt_init_reserved_mem(void)if (nomap)memblock_clear_nomap (rmem->base, rmem->size);else -memblock_free (rmem->base, rmem->size); +memblock_phys_free (rmem->base, + rmem->size); } } }
drivers/s390/char/sclp_early.c renamed from drivers/s390/char/sclp_early.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -139,7 +139,7 @@ int __init sclp_early_get_core_info(stru }sclp_fill_core_info (info, sccb); out: -memblock_free ((unsigned long )sccb, length); +memblock_phys_free ((unsigned long )sccb, length);return rc; }
drivers/usb/early/xhci-dbc.c renamed from drivers/usb/early/xhci-dbc.c~memblock-rename-memblock_free-to-memblock_phys_free +5 -5
@@ -185,7 +185,7 @@ static void __init xdbc_free_ring(structif (!seg)return ; -memblock_free (seg->dma,PAGE_SIZE ); +memblock_phys_free (seg->dma,PAGE_SIZE ); ring->segment =NULL ; }
@@ -665,10 +665,10 @@ int __init early_xdbc_setup_hardware(voixdbc_free_ring (&xdbc.in_ring);if (xdbc.table_dma) -memblock_free (xdbc.table_dma,PAGE_SIZE ); +memblock_phys_free (xdbc.table_dma,PAGE_SIZE );if (xdbc.out_dma) -memblock_free (xdbc.out_dma,PAGE_SIZE ); +memblock_phys_free (xdbc.out_dma,PAGE_SIZE ); xdbc.table_base =NULL ; xdbc.out_buf =NULL ;
@@ -987,8 +987,8 @@ free_and_quit:xdbc_free_ring (&xdbc.evt_ring);xdbc_free_ring (&xdbc.out_ring);xdbc_free_ring (&xdbc.in_ring); -memblock_free (xdbc.table_dma,PAGE_SIZE ); -memblock_free (xdbc.out_dma,PAGE_SIZE ); +memblock_phys_free (xdbc.table_dma,PAGE_SIZE ); +memblock_phys_free (xdbc.out_dma,PAGE_SIZE );writel (0 , &xdbc.xdbc_reg->control);early_iounmap (xdbc.xhci_base, xdbc.xhci_length);
drivers/xen/swiotlb-xen.c renamed from drivers/xen/swiotlb-xen.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -241,7 +241,7 @@ retry:*/ rc =xen_swiotlb_fixup (start, nslabs);if (rc) { -memblock_free (__pa (start),PAGE_ALIGN (bytes)); +memblock_phys_free (__pa (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-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -103,7 +103,7 @@ void memblock_allow_resize(void);int memblock_add_node (phys_addr_t base,phys_addr_t size,int nid);int memblock_add (phys_addr_t base,phys_addr_t size);int memblock_remove (phys_addr_t base,phys_addr_t size); -int memblock_free (phys_addr_t base,phys_addr_t size); +int memblock_phys_free (phys_addr_t base,phys_addr_t size);int memblock_reserve (phys_addr_t base,phys_addr_t size);#ifdef CONFIG_HAVE_MEMBLOCK_PHYS_MAP int memblock_physmem_add (phys_addr_t base,phys_addr_t size);
init/initramfs.c renamed from init/initramfs.c~memblock-rename-memblock_free-to-memblock_phys_free +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_free (__pa (aligned_start), aligned_end - aligned_start); +memblock_phys_free (__pa (aligned_start), aligned_end - aligned_start);#endif free_reserved_area((void *)start, (void *)end, POISON_FREE_INITMEM,
kernel/dma/swiotlb.c renamed from kernel/dma/swiotlb.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -247,7 +247,7 @@ swiotlb_init(int verbose)return ; fail_free_mem: -memblock_free (__pa (tlb), bytes); +memblock_phys_free (__pa (tlb), bytes); fail:pr_warn ("Cannot allocate buffer" ); }
lib/cpumask.c renamed from lib/cpumask.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -188,7 +188,7 @@ EXPORT_SYMBOL(free_cpumask_var);*/ void __init free_bootmem_cpumask_var (cpumask_var_t mask) { -memblock_free (__pa (mask),cpumask_size ()); +memblock_phys_free (__pa (mask),cpumask_size ()); }#endif
mm/cma.c renamed from mm/cma.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -378,7 +378,7 @@ int __init cma_declare_contiguous_nid(phreturn 0 ; free_mem: -memblock_free (base, size); +memblock_phys_free (base, size); err:pr_err ("Failed to reserve %ld MiB\n" , (unsigned long )size /SZ_1M );return ret;
mm/memblock.c renamed from mm/memblock.c~memblock-rename-memblock_free-to-memblock_phys_free +4 -4
@@ -806,18 +806,18 @@ int __init_memblock memblock_remove(phys void __init_memblock memblock_free_ptr(void *ptr, size_t size) {if (ptr) -memblock_free (__pa (ptr), size); +memblock_phys_free (__pa (ptr), size); }/** -* memblock_free - free boot memory block +* memblock_phys_free - free boot memory block * @base: phys starting address of the boot memory block * @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. */ -int __init_memblock memblock_free(phys_addr_t base, phys_addr_t size) +int __init_memblock memblock_phys_free(phys_addr_t base, phys_addr_t size) {phys_addr_t end = base + size -1 ;
@@ -1937,7 +1937,7 @@ static void __init free_memmap(unsigned* memmap array. */ if (pg < pgend) -memblock_free (pg, pgend - pg); +memblock_phys_free (pg, pgend - pg); }/*
mm/memory_hotplug.c renamed from mm/memory_hotplug.c~memblock-rename-memblock_free-to-memblock_phys_free +1 -1
@@ -2204,7 +2204,7 @@ static int __ref try_remove_memory(u64 sarch_remove_memory (start, size, altmap);if (IS_ENABLED (CONFIG_ARCH_KEEP_MEMBLOCK )) { -memblock_free (start, size); +memblock_phys_free (start, size);memblock_remove (start, size); }
mm/percpu.c renamed from mm/percpu.c~memblock-rename-memblock_free-to-memblock_phys_free +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 (__pa (ai), ai->__ai_size); +memblock_phys_free (__pa (ai), ai->__ai_size); }/**
@@ -3134,7 +3134,7 @@ out_free_areas: out_free:pcpu_free_alloc_info (ai);if (areas) -memblock_free (__pa (areas), areas_size); +memblock_phys_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 (__pa (pages), pages_size); +memblock_phys_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 (__pa (ptr), size); +memblock_phys_free (__pa (ptr), size); }void __init setup_per_cpu_areas (void )
mm/sparse.c renamed from mm/sparse.c~memblock-rename-memblock_free-to-memblock_phys_free +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 (__pa (sparsemap_buf), size); +memblock_phys_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