Commit 4cd48bb3 authored by Randy Dunlap's avatar Randy Dunlap Committed by Palmer Dabbelt

arch_numa: fix common code printing of phys_addr_t

Fix build warnings in the arch_numa common code:

../include/linux/kern_levels.h:5:18: warning: format '%Lx' expects argument of type 'long long unsigned int', but argument 3 has type 'phys_addr_t' {aka 'unsigned int'} [-Wformat=]
../drivers/base/arch_numa.c:360:56: note: format string is defined here
  360 |    pr_warn("Warning: invalid memblk node %d [mem %#010Lx-%#010Lx]\n",
../drivers/base/arch_numa.c:435:39: note: format string is defined here
  435 |  pr_info("Faking a node at [mem %#018Lx-%#018Lx]\n", start, end - 1);

Fixes: ae3c107c ("numa: Move numa implementation to common code")
Signed-off-by: default avatarRandy Dunlap <rdunlap@infradead.org>
Reported-by: default avatarkernel test robot <lkp@intel.com>
Reviewed-by: default avatarAtish Patra <atish.patra@wdc.com>
Signed-off-by: default avatarPalmer Dabbelt <palmerdabbelt@google.com>
parent 3449831d
...@@ -355,11 +355,12 @@ static int __init numa_register_nodes(void) ...@@ -355,11 +355,12 @@ static int __init numa_register_nodes(void)
/* Check that valid nid is set to memblks */ /* Check that valid nid is set to memblks */
for_each_mem_region(mblk) { for_each_mem_region(mblk) {
int mblk_nid = memblock_get_region_node(mblk); int mblk_nid = memblock_get_region_node(mblk);
phys_addr_t start = mblk->base;
phys_addr_t end = mblk->base + mblk->size - 1;
if (mblk_nid == NUMA_NO_NODE || mblk_nid >= MAX_NUMNODES) { if (mblk_nid == NUMA_NO_NODE || mblk_nid >= MAX_NUMNODES) {
pr_warn("Warning: invalid memblk node %d [mem %#010Lx-%#010Lx]\n", pr_warn("Warning: invalid memblk node %d [mem %pap-%pap]\n",
mblk_nid, mblk->base, mblk_nid, &start, &end);
mblk->base + mblk->size - 1);
return -EINVAL; return -EINVAL;
} }
} }
...@@ -427,14 +428,14 @@ static int __init numa_init(int (*init_func)(void)) ...@@ -427,14 +428,14 @@ static int __init numa_init(int (*init_func)(void))
static int __init dummy_numa_init(void) static int __init dummy_numa_init(void)
{ {
phys_addr_t start = memblock_start_of_DRAM(); phys_addr_t start = memblock_start_of_DRAM();
phys_addr_t end = memblock_end_of_DRAM(); phys_addr_t end = memblock_end_of_DRAM() - 1;
int ret; int ret;
if (numa_off) if (numa_off)
pr_info("NUMA disabled\n"); /* Forced off on command line. */ pr_info("NUMA disabled\n"); /* Forced off on command line. */
pr_info("Faking a node at [mem %#018Lx-%#018Lx]\n", start, end - 1); pr_info("Faking a node at [mem %pap-%pap]\n", &start, &end);
ret = numa_add_memblk(0, start, end); ret = numa_add_memblk(0, start, end + 1);
if (ret) { if (ret) {
pr_err("NUMA init failed\n"); pr_err("NUMA init failed\n");
return ret; return ret;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment