Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a8dd708 authored by Mike Rapoport's avatar Mike Rapoport Committed by Linus Torvalds
Browse files

memblock: rename memblock_alloc{_nid,_try_nid} to memblock_phys_alloc* 

Make it explicit that the caller gets a physical address rather than a
virtual one.

This will also allow using meblock_alloc prefix for memblock allocations
returning virtual address, which is done in the following patches.

The conversion is done using the following semantic patch:

@@
expression e1, e2, e3;
@@
(
- memblock_alloc(e1, e2)
+ memblock_phys_alloc(e1, e2)
|
- memblock_alloc_nid(e1, e2, e3)
+ memblock_phys_alloc_nid(e1, e2, e3)
|
- memblock_alloc_try_nid(e1, e2, e3)
+ memblock_phys_alloc_try_nid(e1, e2, e3)
)

Link: http://lkml.kernel.org/r/1536927045-23536-7-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 b146ada2

arch/arm/mm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -721,7 +721,7 @@ EXPORT_SYMBOL(phys_mem_access_prot); 


static void __init *early_alloc_aligned(unsigned long sz, unsigned long align)

{

	void *ptr = __va(memblock_alloc(sz, align));

	void *ptr = __va(memblock_phys_alloc(sz, align));

	memset(ptr, 0, sz);

	return ptr;

}

arch/arm64/mm/mmu.c

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static phys_addr_t __init early_pgtable_alloc(void) 
	phys_addr_t phys;

	void *ptr;



	phys = memblock_alloc(PAGE_SIZE, PAGE_SIZE);

	phys = memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE);



	/*

	 * The FIX_{PGD,PUD,PMD} slots may be in active use, but the FIX_PTE

arch/arm64/mm/numa.c

+1 −1
Original line number Diff line number Diff line
@@ -237,7 +237,7 @@ static void __init setup_node_data(int nid, u64 start_pfn, u64 end_pfn) 
	if (start_pfn >= end_pfn)

		pr_info("Initmem setup node %d [<memory-less node>]\n", nid);



	nd_pa = memblock_alloc_try_nid(nd_size, SMP_CACHE_BYTES, nid);

	nd_pa = memblock_phys_alloc_try_nid(nd_size, SMP_CACHE_BYTES, nid);

	nd = __va(nd_pa);



	/* report and initialize */

arch/c6x/mm/dma-coherent.c

+2 −2
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ void __init coherent_mem_init(phys_addr_t start, u32 size) 
	if (dma_size & (PAGE_SIZE - 1))

		++dma_pages;



	bitmap_phys = memblock_alloc(BITS_TO_LONGS(dma_pages) * sizeof(long),

	bitmap_phys = memblock_phys_alloc(BITS_TO_LONGS(dma_pages) * sizeof(long),

					  sizeof(long));



	dma_bitmap = phys_to_virt(bitmap_phys);

arch/nds32/mm/init.c

+4 −4
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ static void __init map_ram(void) 
		}



		/* Alloc one page for holding PTE's... */

		pte = (pte_t *) __va(memblock_alloc(PAGE_SIZE, PAGE_SIZE));

		pte = (pte_t *) __va(memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE));

		memset(pte, 0, PAGE_SIZE);

		set_pmd(pme, __pmd(__pa(pte) + _PAGE_KERNEL_TABLE));
@@ -114,7 +114,7 @@ static void __init fixedrange_init(void) 
	pgd = swapper_pg_dir + pgd_index(vaddr);

	pud = pud_offset(pgd, vaddr);

	pmd = pmd_offset(pud, vaddr);

	fixmap_pmd_p = (pmd_t *) __va(memblock_alloc(PAGE_SIZE, PAGE_SIZE));

	fixmap_pmd_p = (pmd_t *) __va(memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE));

	memset(fixmap_pmd_p, 0, PAGE_SIZE);

	set_pmd(pmd, __pmd(__pa(fixmap_pmd_p) + _PAGE_KERNEL_TABLE));
@@ -127,7 +127,7 @@ static void __init fixedrange_init(void) 
	pgd = swapper_pg_dir + pgd_index(vaddr);

	pud = pud_offset(pgd, vaddr);

	pmd = pmd_offset(pud, vaddr);

	pte = (pte_t *) __va(memblock_alloc(PAGE_SIZE, PAGE_SIZE));

	pte = (pte_t *) __va(memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE));

	memset(pte, 0, PAGE_SIZE);

	set_pmd(pmd, __pmd(__pa(pte) + _PAGE_KERNEL_TABLE));

	pkmap_page_table = pte;
@@ -153,7 +153,7 @@ void __init paging_init(void) 
	fixedrange_init();



	/* allocate space for empty_zero_page */

	zero_page = __va(memblock_alloc(PAGE_SIZE, PAGE_SIZE));

	zero_page = __va(memblock_phys_alloc(PAGE_SIZE, PAGE_SIZE));

	memset(zero_page, 0, PAGE_SIZE);

	zone_sizes_init();