Re: [RFC PATCH 10/29] memblock: replace __alloc_bootmem_node_nopanic with memblock_alloc_try_nid_nopanic
From: Michal Hocko <mhocko@kernel.org>
Date: 2018-09-06 07:49:25
Also in:
linux-mips, linuxppc-dev, lkml, sparclinux
On Wed 05-09-18 18:59:25, Mike Rapoport wrote:
The __alloc_bootmem_node_nopanic() is used only once, there is no reason to add a wrapper for memblock_alloc_try_nid_nopanic for it.
OK, it took me a bit longer to see they are equivalent. Both zero the memory and fallback to a different node if the given one doesn't have a proper range. So good. Lack of proper documentation didn't really help.
Signed-off-by: Mike Rapoport <redacted>
Acked-by: Michal Hocko <mhocko@suse.com>
quoted hunk ↗ jump to hunk
--- arch/x86/kernel/setup_percpu.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)diff --git a/arch/x86/kernel/setup_percpu.c b/arch/x86/kernel/setup_percpu.c index ea554f8..67d48e26 100644 --- a/arch/x86/kernel/setup_percpu.c +++ b/arch/x86/kernel/setup_percpu.c@@ -112,8 +112,10 @@ static void * __init pcpu_alloc_bootmem(unsigned int cpu, unsigned long size, pr_debug("per cpu data for cpu%d %lu bytes at %016lx\n", cpu, size, __pa(ptr)); } else { - ptr = __alloc_bootmem_node_nopanic(NODE_DATA(node), - size, align, goal); + ptr = memblock_alloc_try_nid_nopanic(size, align, goal, + BOOTMEM_ALLOC_ACCESSIBLE, + node); + pr_debug("per cpu data for cpu%d %lu bytes on node%d at %016lx\n", cpu, size, node, __pa(ptr)); }-- 2.7.4
-- Michal Hocko SUSE Labs