memblock: replace BOOTMEM_ALLOC_* with MEMBLOCK variants (97ad1087) · Commits · 戴 / test

Drop BOOTMEM_ALLOC_ACCESSIBLE and BOOTMEM_ALLOC_ANYWHERE in favor of identical MEMBLOCK definitions. Link: http://lkml.kernel.org/r/1536927045-23536-29-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>

arch/ia64/mm/discontig.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -453,7 +453,7 @@ static void __init *memory_less_node_alloc(int nid, unsigned long pernodesize)

		ptr = memblock_alloc_try_nid(pernodesize, PERCPU_PAGE_SIZE,
		__pa(MAX_DMA_ADDRESS),
		BOOTMEM_ALLOC_ACCESSIBLE,
		MEMBLOCK_ALLOC_ACCESSIBLE,
		bestnode);

		return ptr;

arch/powerpc/kernel/setup_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -764,7 +764,7 @@ void __init emergency_stack_init(void)
		static void * __init pcpu_fc_alloc(unsigned int cpu, size_t size, size_t align)
		{
		return memblock_alloc_try_nid(size, align, __pa(MAX_DMA_ADDRESS),
		BOOTMEM_ALLOC_ACCESSIBLE,
		MEMBLOCK_ALLOC_ACCESSIBLE,
		early_cpu_to_node(cpu));

		}

arch/sparc/kernel/smp_64.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1595,7 +1595,7 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, size_t size,
		cpu, size, __pa(ptr));
		} else {
		ptr = memblock_alloc_try_nid(size, align, goal,
		BOOTMEM_ALLOC_ACCESSIBLE, node);
		MEMBLOCK_ALLOC_ACCESSIBLE, node);
		pr_debug("per cpu data for cpu%d %lu bytes on node%d at "
		"%016lx\n", cpu, size, node, __pa(ptr));
		}

arch/x86/kernel/setup_percpu.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -114,7 +114,7 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size,
		cpu, size, __pa(ptr));
		} else {
		ptr = memblock_alloc_try_nid_nopanic(size, align, goal,
		BOOTMEM_ALLOC_ACCESSIBLE,
		MEMBLOCK_ALLOC_ACCESSIBLE,
		node);

		pr_debug("per cpu data for cpu%d %lu bytes on node%d at %016lx\n",

arch/x86/mm/kasan_init_64.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -29,10 +29,10 @@ static __init void *early_alloc(size_t size, int nid, bool panic)
		{
		if (panic)
		return memblock_alloc_try_nid(size, size,
		__pa(MAX_DMA_ADDRESS), BOOTMEM_ALLOC_ACCESSIBLE, nid);
		__pa(MAX_DMA_ADDRESS), MEMBLOCK_ALLOC_ACCESSIBLE, nid);
		else
		return memblock_alloc_try_nid_nopanic(size, size,
		__pa(MAX_DMA_ADDRESS), BOOTMEM_ALLOC_ACCESSIBLE, nid);
		__pa(MAX_DMA_ADDRESS), MEMBLOCK_ALLOC_ACCESSIBLE, nid);
		}

		static void __init kasan_populate_pmd(pmd_t *pmd, unsigned long addr,

Admin message