Skip to content

Commit 2013288

Browse files
rppttorvalds
rppt
authored and
torvalds
committed
memblock: replace free_bootmem{_node} with memblock_free
The free_bootmem and free_bootmem_node are merely wrappers for memblock_free. Replace their usage with a call to memblock_free using the following semantic patch: @@ expression e1, e2, e3; @@ ( - free_bootmem(e1, e2) + memblock_free(e1, e2) | - free_bootmem_node(e1, e2, e3) + memblock_free(e2, e3) ) Link: http://lkml.kernel.org/r/1536927045-23536-24-git-send-email-rppt@linux.vnet.ibm.com Signed-off-by: Mike Rapoport <rppt@linux.vnet.ibm.com> Acked-by: Michal Hocko <mhocko@suse.com> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Chris Zankel <chris@zankel.net> Cc: "David S. Miller" <davem@davemloft.net> Cc: Geert Uytterhoeven <geert@linux-m68k.org> Cc: Greentime Hu <green.hu@gmail.com> Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org> Cc: Guan Xuetao <gxt@pku.edu.cn> Cc: Ingo Molnar <mingo@redhat.com> Cc: "James E.J. Bottomley" <jejb@parisc-linux.org> Cc: Jonas Bonn <jonas@southpole.se> Cc: Jonathan Corbet <corbet@lwn.net> Cc: Ley Foon Tan <lftan@altera.com> Cc: Mark Salter <msalter@redhat.com> Cc: Martin Schwidefsky <schwidefsky@de.ibm.com> Cc: Matt Turner <mattst88@gmail.com> Cc: Michael Ellerman <mpe@ellerman.id.au> Cc: Michal Simek <monstr@monstr.eu> Cc: Palmer Dabbelt <palmer@sifive.com> Cc: Paul Burton <paul.burton@mips.com> Cc: Richard Kuo <rkuo@codeaurora.org> Cc: Richard Weinberger <richard@nod.at> Cc: Rich Felker <dalias@libc.org> Cc: Russell King <linux@armlinux.org.uk> Cc: Serge Semin <fancer.lancer@gmail.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Tony Luck <tony.luck@intel.com> Cc: Vineet Gupta <vgupta@synopsys.com> Cc: Yoshinori Sato <ysato@users.sourceforge.jp> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
1 parent 6c7835f commit 2013288

File tree

15 files changed

+24
-52
lines changed

15 files changed

+24
-52
lines changed

‎arch/alpha/kernel/core_irongate.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -234,8 +234,7 @@ albacore_init_arch(void)
234234
unsigned long size;
235235

236236
size = initrd_end - initrd_start;
237-
free_bootmem_node(NODE_DATA(0), __pa(initrd_start),
238-
PAGE_ALIGN(size));
237+
memblock_free(__pa(initrd_start), PAGE_ALIGN(size));
239238
if (!move_initrd(pci_mem))
240239
printk("irongate_init_arch: initrd too big "
241240
"(%ldK)\ndisabling initrd\n",

‎arch/arm64/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -536,7 +536,7 @@ static inline void free_memmap(unsigned long start_pfn, unsigned long end_pfn)
536536
* memmap array.
537537
*/
538538
if (pg < pgend)
539-
free_bootmem(pg, pgend - pg);
539+
memblock_free(pg, pgend - pg);
540540
}
541541

542542
/*

‎arch/mips/kernel/setup.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -561,7 +561,7 @@ static void __init bootmem_init(void)
561561
extern void show_kernel_relocation(const char *level);
562562

563563
offset = __pa_symbol(_text) - __pa_symbol(VMLINUX_LOAD_ADDRESS);
564-
free_bootmem(__pa_symbol(VMLINUX_LOAD_ADDRESS), offset);
564+
memblock_free(__pa_symbol(VMLINUX_LOAD_ADDRESS), offset);
565565

566566
#if defined(CONFIG_DEBUG_KERNEL) && defined(CONFIG_DEBUG_INFO)
567567
/*

‎arch/powerpc/kernel/setup_64.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -771,7 +771,7 @@ static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align)
771771

772772
static void __init pcpu_fc_free(void *ptr, size_t size)
773773
{
774-
free_bootmem(__pa(ptr), size);
774+
memblock_free(__pa(ptr), size);
775775
}
776776

777777
static int pcpu_cpu_distance(unsigned int from, unsigned int to)

‎arch/sparc/kernel/smp_64.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1607,7 +1607,7 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, size_t size,
16071607

16081608
static void __init pcpu_free_bootmem(void *ptr, size_t size)
16091609
{
1610-
free_bootmem(__pa(ptr), size);
1610+
memblock_free(__pa(ptr), size);
16111611
}
16121612

16131613
static int __init pcpu_cpu_distance(unsigned int from, unsigned int to)

‎arch/um/kernel/mem.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#include <linux/stddef.h>
77
#include <linux/module.h>
88
#include <linux/bootmem.h>
9+
#include <linux/memblock.h>
910
#include <linux/highmem.h>
1011
#include <linux/mm.h>
1112
#include <linux/swap.h>
@@ -46,7 +47,7 @@ void __init mem_init(void)
4647
*/
4748
brk_end = (unsigned long) UML_ROUND_UP(sbrk(0));
4849
map_memory(brk_end, __pa(brk_end), uml_reserved - brk_end, 1, 1, 0);
49-
free_bootmem(__pa(brk_end), uml_reserved - brk_end);
50+
memblock_free(__pa(brk_end), uml_reserved - brk_end);
5051
uml_reserved = brk_end;
5152

5253
/* this will put all low memory onto the freelists */

‎arch/unicore32/mm/init.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,7 @@ free_memmap(unsigned long start_pfn, unsigned long end_pfn)
238238
* free the section of the memmap array.
239239
*/
240240
if (pg < pgend)
241-
free_bootmem(pg, pgend - pg);
241+
memblock_free(pg, pgend - pg);
242242
}
243243

244244
/*

‎arch/x86/kernel/setup_percpu.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
#include <linux/export.h>
66
#include <linux/init.h>
77
#include <linux/bootmem.h>
8+
#include <linux/memblock.h>
89
#include <linux/percpu.h>
910
#include <linux/kexec.h>
1011
#include <linux/crash_dump.h>
@@ -135,7 +136,7 @@ static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align)
135136

136137
static void __init pcpu_fc_free(void *ptr, size_t size)
137138
{
138-
free_bootmem(__pa(ptr), size);
139+
memblock_free(__pa(ptr), size);
139140
}
140141

141142
static int __init pcpu_cpu_distance(unsigned int from, unsigned int to)

‎arch/x86/kernel/tce_64.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
#include <linux/pci.h>
3232
#include <linux/dma-mapping.h>
3333
#include <linux/bootmem.h>
34+
#include <linux/memblock.h>
3435
#include <asm/tce.h>
3536
#include <asm/calgary.h>
3637
#include <asm/proto.h>
@@ -186,5 +187,5 @@ void __init free_tce_table(void *tbl)
186187
size = table_size_to_number_of_entries(specified_table_size);
187188
size *= TCE_ENTRY_SIZE;
188189

189-
free_bootmem(__pa(tbl), size);
190+
memblock_free(__pa(tbl), size);
190191
}

‎arch/x86/xen/p2m.c

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
#include <linux/sched.h>
6969
#include <linux/seq_file.h>
7070
#include <linux/bootmem.h>
71+
#include <linux/memblock.h>
7172
#include <linux/slab.h>
7273
#include <linux/vmalloc.h>
7374

@@ -190,7 +191,7 @@ static void * __ref alloc_p2m_page(void)
190191
static void __ref free_p2m_page(void *p)
191192
{
192193
if (unlikely(!slab_is_available())) {
193-
free_bootmem((unsigned long)p, PAGE_SIZE);
194+
memblock_free((unsigned long)p, PAGE_SIZE);
194195
return;
195196
}
196197

‎drivers/macintosh/smu.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,7 +569,7 @@ int __init smu_init (void)
569569
fail_db_node:
570570
of_node_put(smu->db_node);
571571
fail_bootmem:
572-
free_bootmem(__pa(smu), sizeof(struct smu_device));
572+
memblock_free(__pa(smu), sizeof(struct smu_device));
573573
smu = NULL;
574574
fail_np:
575575
of_node_put(np);

‎drivers/usb/early/xhci-dbc.c

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
#include <linux/pci_regs.h>
1414
#include <linux/pci_ids.h>
1515
#include <linux/bootmem.h>
16+
#include <linux/memblock.h>
1617
#include <linux/io.h>
1718
#include <asm/pci-direct.h>
1819
#include <asm/fixmap.h>
@@ -191,7 +192,7 @@ static void __init xdbc_free_ring(struct xdbc_ring *ring)
191192
if (!seg)
192193
return;
193194

194-
free_bootmem(seg->dma, PAGE_SIZE);
195+
memblock_free(seg->dma, PAGE_SIZE);
195196
ring->segment = NULL;
196197
}
197198

@@ -675,10 +676,10 @@ int __init early_xdbc_setup_hardware(void)
675676
xdbc_free_ring(&xdbc.in_ring);
676677

677678
if (xdbc.table_dma)
678-
free_bootmem(xdbc.table_dma, PAGE_SIZE);
679+
memblock_free(xdbc.table_dma, PAGE_SIZE);
679680

680681
if (xdbc.out_dma)
681-
free_bootmem(xdbc.out_dma, PAGE_SIZE);
682+
memblock_free(xdbc.out_dma, PAGE_SIZE);
682683

683684
xdbc.table_base = NULL;
684685
xdbc.out_buf = NULL;
@@ -997,8 +998,8 @@ static int __init xdbc_init(void)
997998
xdbc_free_ring(&xdbc.evt_ring);
998999
xdbc_free_ring(&xdbc.out_ring);
9991000
xdbc_free_ring(&xdbc.in_ring);
1000-
free_bootmem(xdbc.table_dma, PAGE_SIZE);
1001-
free_bootmem(xdbc.out_dma, PAGE_SIZE);
1001+
memblock_free(xdbc.table_dma, PAGE_SIZE);
1002+
memblock_free(xdbc.out_dma, PAGE_SIZE);
10021003
writel(0, &xdbc.xdbc_reg->control);
10031004
early_iounmap(xdbc.xhci_base, xdbc.xhci_length);
10041005

‎drivers/xen/swiotlb-xen.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#define pr_fmt(fmt) "xen:" KBUILD_MODNAME ": " fmt
3737

3838
#include <linux/bootmem.h>
39+
#include <linux/memblock.h>
3940
#include <linux/dma-direct.h>
4041
#include <linux/export.h>
4142
#include <xen/swiotlb-xen.h>
@@ -248,7 +249,8 @@ int __ref xen_swiotlb_init(int verbose, bool early)
248249
xen_io_tlb_nslabs);
249250
if (rc) {
250251
if (early)
251-
free_bootmem(__pa(xen_io_tlb_start), PAGE_ALIGN(bytes));
252+
memblock_free(__pa(xen_io_tlb_start),
253+
PAGE_ALIGN(bytes));
252254
else {
253255
free_pages((unsigned long)xen_io_tlb_start, order);
254256
xen_io_tlb_start = NULL;

‎include/linux/bootmem.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ extern unsigned long free_all_bootmem(void);
3030
extern void reset_node_managed_pages(pg_data_t *pgdat);
3131
extern void reset_all_zones_managed_pages(void);
3232

33-
extern void free_bootmem_node(pg_data_t *pgdat,
34-
unsigned long addr,
35-
unsigned long size);
36-
extern void free_bootmem(unsigned long physaddr, unsigned long size);
3733
extern void free_bootmem_late(unsigned long physaddr, unsigned long size);
3834

3935
/* We are using top down, so it is safe to use 0 here */

‎mm/nobootmem.c

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -150,33 +150,3 @@ unsigned long __init free_all_bootmem(void)
150150

151151
return pages;
152152
}
153-
154-
/**
155-
* free_bootmem_node - mark a page range as usable
156-
* @pgdat: node the range resides on
157-
* @physaddr: starting physical address of the range
158-
* @size: size of the range in bytes
159-
*
160-
* Partial pages will be considered reserved and left as they are.
161-
*
162-
* The range must reside completely on the specified node.
163-
*/
164-
void __init free_bootmem_node(pg_data_t *pgdat, unsigned long physaddr,
165-
unsigned long size)
166-
{
167-
memblock_free(physaddr, size);
168-
}
169-
170-
/**
171-
* free_bootmem - mark a page range as usable
172-
* @addr: starting physical address of the range
173-
* @size: size of the range in bytes
174-
*
175-
* Partial pages will be considered reserved and left as they are.
176-
*
177-
* The range must be contiguous but may span node boundaries.
178-
*/
179-
void __init free_bootmem(unsigned long addr, unsigned long size)
180-
{
181-
memblock_free(addr, size);
182-
}

0 commit comments

Comments
 (0)