|
@@ -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",
|
|
pr_debug("per cpu data for cpu%d %lu bytes at %016lx\n",
|
|
cpu, size, __pa(ptr));
|
|
cpu, size, __pa(ptr));
|
|
} else {
|
|
} 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",
|
|
pr_debug("per cpu data for cpu%d %lu bytes on node%d at %016lx\n",
|
|
cpu, size, node, __pa(ptr));
|
|
cpu, size, node, __pa(ptr));
|
|
}
|
|
}
|