Commit 4fc4a09e authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

memblock: replace __alloc_bootmem with memblock_alloc_from 

The functions are equivalent, just the later does not require nobootmem
translation layer.

The conversion is done using the following semantic patch:

@@
expression size, align, goal;
@@
- __alloc_bootmem(size, align, goal)
+ memblock_alloc_from(size, align, goal)

Link: http://lkml.kernel.org/r/1536927045-23536-21-git-send-email-rppt@linux.vnet.ibm.com


Signed-off-by: default avatarMike Rapoport <rppt@linux.vnet.ibm.com>
Acked-by: default avatarMichal 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: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 15c3c114

arch/alpha/kernel/core_cia.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ cia_prepare_tbia_workaround(int window) 
	long i;



	/* Use minimal 1K map. */

	ppte = __alloc_bootmem(CIA_BROKEN_TBIA_SIZE, 32768, 0);

	ppte = memblock_alloc_from(CIA_BROKEN_TBIA_SIZE, 32768, 0);

	pte = (virt_to_phys(ppte) >> (PAGE_SHIFT - 1)) | 1;



	for (i = 0; i < CIA_BROKEN_TBIA_SIZE / sizeof(unsigned long); ++i)

arch/alpha/kernel/pci_iommu.c

+2 −2
Original line number Diff line number Diff line
@@ -87,13 +87,13 @@ iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base, 
		printk("%s: couldn't allocate arena ptes from node %d\n"

		       "    falling back to system-wide allocation\n",

		       __func__, nid);

		arena->ptes = __alloc_bootmem(mem_size, align, 0);

		arena->ptes = memblock_alloc_from(mem_size, align, 0);

	}



#else /* CONFIG_DISCONTIGMEM */



	arena = alloc_bootmem(sizeof(*arena));

	arena->ptes = __alloc_bootmem(mem_size, align, 0);

	arena->ptes = memblock_alloc_from(mem_size, align, 0);



#endif /* CONFIG_DISCONTIGMEM */

arch/alpha/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -294,7 +294,7 @@ move_initrd(unsigned long mem_limit) 
	unsigned long size;



	size = initrd_end - initrd_start;

	start = __alloc_bootmem(PAGE_ALIGN(size), PAGE_SIZE, 0);

	start = memblock_alloc_from(PAGE_ALIGN(size), PAGE_SIZE, 0);

	if (!start || __pa(start) + size > mem_limit) {

		initrd_start = initrd_end = 0;

		return NULL;

arch/ia64/kernel/mca.c

+2 −2
Original line number Diff line number Diff line
@@ -1835,7 +1835,7 @@ format_mca_init_stack(void *mca_data, unsigned long offset, 
/* Caller prevents this from being called after init */

static void * __ref mca_bootmem(void)

{

	return __alloc_bootmem(sizeof(struct ia64_mca_cpu),

	return memblock_alloc_from(sizeof(struct ia64_mca_cpu),

				   KERNEL_STACK_SIZE, 0);

}

arch/ia64/mm/contig.c

+3 −2
Original line number Diff line number Diff line
@@ -85,8 +85,9 @@ skip: 
static inline void

alloc_per_cpu_data(void)

{

	cpu_data = __alloc_bootmem(PERCPU_PAGE_SIZE * num_possible_cpus(),

				   PERCPU_PAGE_SIZE, __pa(MAX_DMA_ADDRESS));

	cpu_data = memblock_alloc_from(PERCPU_PAGE_SIZE * num_possible_cpus(),

				       PERCPU_PAGE_SIZE,

				       __pa(MAX_DMA_ADDRESS));

}



/**

CRA Git | Maintained and supported by SUSTech CRA and CCSE