public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

arm64, NUMA: rework numa_add_memblk()

Browse source 
Rework numa_add_memblk() to update the parameter "u64 size" to "u64
end", this will make it consistent with x86 and simplifies the arm64
ACPI NUMA code to be added later.

Signed-off-by: Hanjun Guo <hanjun.guo@linaro.org>
Signed-off-by: Robert Richter <rrichter@cavium.com>
Signed-off-by: David Daney <david.daney@cavium.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
This commit is contained in:
Hanjun Guo 2016-05-24 15:35:36 -07:00 • committed by Rafael J. Wysocki
parent 6525afdf53
commit 8ccbbdaa2b
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
arch/arm64/mm/numa.c
View file

@ -131,25 +131,25 @@ void __init early_map_cpu_to_node(unsigned int cpu, int nid)
* numa_add_memblk - Set node id to memblk * numa_add_memblk - Set node id to memblk
* @nid: NUMA node ID of the new memblk * @nid: NUMA node ID of the new memblk
* @start: Start address of the new memblk * @start: Start address of the new memblk
* @size: Size of the new memblk * @end: End address of the new memblk
* *
* RETURNS: * RETURNS:
* 0 on success, -errno on failure. * 0 on success, -errno on failure.
*/ */
int __init numa_add_memblk(int nid, u64 start, u64 size) int __init numa_add_memblk(int nid, u64 start, u64 end)
{ {
int ret; int ret;
ret = memblock_set_node(start, size, &memblock.memory, nid); ret = memblock_set_node(start, (end - start), &memblock.memory, nid);
if (ret < 0) { if (ret < 0) {
pr_err("NUMA: memblock [0x%llx - 0x%llx] failed to add on node %d\n", pr_err("NUMA: memblock [0x%llx - 0x%llx] failed to add on node %d\n",
start, (start + size - 1), nid); start, (end - 1), nid);
return ret; return ret;
} }
node_set(nid, numa_nodes_parsed); node_set(nid, numa_nodes_parsed);
pr_info("NUMA: Adding memblock [0x%llx - 0x%llx] on node %d\n", pr_info("NUMA: Adding memblock [0x%llx - 0x%llx] on node %d\n",
start, (start + size - 1), nid); start, (end - 1), nid);
return ret; return ret;
} }
@ -367,7 +367,7 @@ static int __init dummy_numa_init(void)
0LLU, PFN_PHYS(max_pfn) - 1); 0LLU, PFN_PHYS(max_pfn) - 1);
for_each_memblock(memory, mblk) { for_each_memblock(memory, mblk) {
ret = numa_add_memblk(0, mblk->base, mblk->size); ret = numa_add_memblk(0, mblk->base, mblk->base + mblk->size);
if (!ret) if (!ret)
continue; continue;

4
drivers/of/of_numa.c
View file

@ -91,8 +91,8 @@ static int __init of_numa_parse_memory_nodes(void)
pr_debug("NUMA: base = %llx len = %llx, node = %u\n", pr_debug("NUMA: base = %llx len = %llx, node = %u\n",
rsrc.start, rsrc.end - rsrc.start + 1, nid); rsrc.start, rsrc.end - rsrc.start + 1, nid);
r = numa_add_memblk(nid, rsrc.start,
rsrc.end - rsrc.start + 1); r = numa_add_memblk(nid, rsrc.start, rsrc.end + 1);
if (r) if (r)
break; break;
} }