Commit 2a5bda5a authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

memblock: replace alloc_bootmem with memblock_alloc 

The alloc_bootmem(size) is a shortcut for allocation of SMP_CACHE_BYTES
aligned memory. When the align parameter of memblock_alloc() is 0, the
alignment is implicitly set to SMP_CACHE_BYTES and thus alloc_bootmem(size)
and memblock_alloc(size, 0) are equivalent.

The conversion is done using the following semantic patch:

@@
expression size;
@@
- alloc_bootmem(size)
+ memblock_alloc(size, 0)

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


Signed-off-by: default avatarMike Rapoport <rppt@linux.vnet.ibm.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 Hocko <mhocko@suse.com>
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 4fc4a09e

arch/alpha/kernel/core_marvel.c

+2 −2
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ mk_resource_name(int pe, int port, char *str) 
	char *name;

	

	sprintf(tmp, "PCI %s PE %d PORT %d", str, pe, port);

	name = alloc_bootmem(strlen(tmp) + 1);

	name = memblock_alloc(strlen(tmp) + 1, 0);

	strcpy(name, tmp);



	return name;
@@ -117,7 +117,7 @@ alloc_io7(unsigned int pe) 
		return NULL;

	}



	io7 = alloc_bootmem(sizeof(*io7));

	io7 = memblock_alloc(sizeof(*io7), 0);

	io7->pe = pe;

	raw_spin_lock_init(&io7->irq_lock);

arch/alpha/kernel/pci-noop.c

+2 −2
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ alloc_pci_controller(void) 
{

	struct pci_controller *hose;



	hose = alloc_bootmem(sizeof(*hose));

	hose = memblock_alloc(sizeof(*hose), 0);



	*hose_tail = hose;

	hose_tail = &hose->next;
@@ -44,7 +44,7 @@ alloc_pci_controller(void) 
struct resource * __init

alloc_resource(void)

{

	return alloc_bootmem(sizeof(struct resource));

	return memblock_alloc(sizeof(struct resource), 0);

}



SYSCALL_DEFINE3(pciconfig_iobase, long, which, unsigned long, bus,

arch/alpha/kernel/pci.c

+2 −2
Original line number Diff line number Diff line
@@ -392,7 +392,7 @@ alloc_pci_controller(void) 
{

	struct pci_controller *hose;



	hose = alloc_bootmem(sizeof(*hose));

	hose = memblock_alloc(sizeof(*hose), 0);



	*hose_tail = hose;

	hose_tail = &hose->next;
@@ -403,7 +403,7 @@ alloc_pci_controller(void) 
struct resource * __init

alloc_resource(void)

{

	return alloc_bootmem(sizeof(struct resource));

	return memblock_alloc(sizeof(struct resource), 0);

}

arch/alpha/kernel/pci_iommu.c

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

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

		       __func__, nid);

		arena = alloc_bootmem(sizeof(*arena));

		arena = memblock_alloc(sizeof(*arena), 0);

	}



	arena->ptes = memblock_alloc_node(sizeof(*arena), align, nid);
@@ -92,7 +92,7 @@ iommu_arena_new_node(int nid, struct pci_controller *hose, dma_addr_t base, 


#else /* CONFIG_DISCONTIGMEM */



	arena = alloc_bootmem(sizeof(*arena));

	arena = memblock_alloc(sizeof(*arena), 0);

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



#endif /* CONFIG_DISCONTIGMEM */

arch/ia64/kernel/mca.c

+2 −2
Original line number Diff line number Diff line
@@ -361,9 +361,9 @@ static ia64_state_log_t ia64_state_log[IA64_MAX_LOG_TYPES]; 


#define IA64_LOG_ALLOCATE(it, size) \

	{ia64_state_log[it].isl_log[IA64_LOG_CURR_INDEX(it)] = \

		(ia64_err_rec_t *)alloc_bootmem(size); \

		(ia64_err_rec_t *)memblock_alloc(size, 0); \

	ia64_state_log[it].isl_log[IA64_LOG_NEXT_INDEX(it)] = \

		(ia64_err_rec_t *)alloc_bootmem(size);}

		(ia64_err_rec_t *)memblock_alloc(size, 0);}

#define IA64_LOG_LOCK_INIT(it) spin_lock_init(&ia64_state_log[it].isl_lock)

#define IA64_LOG_LOCK(it)      spin_lock_irqsave(&ia64_state_log[it].isl_lock, s)

#define IA64_LOG_UNLOCK(it)    spin_unlock_irqrestore(&ia64_state_log[it].isl_lock,s)

CRA Git | Maintained and supported by SUSTech CRA and CCSE