mirror of
https://github.com/edk2-porting/linux-next.git
synced 2024-12-17 01:34:00 +08:00
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: ae3c107cd8
("numa: Move numa implementation to common code")
Signed-off-by: Randy Dunlap <rdunlap@infradead.org>
Reported-by: kernel test robot <lkp@intel.com>
Reviewed-by: Atish Patra <atish.patra@wdc.com>
Signed-off-by: Palmer Dabbelt <palmerdabbelt@google.com>
This commit is contained in:
parent
3449831d92
commit
4cd48bb3b0
@ -355,11 +355,12 @@ static int __init numa_register_nodes(void)
|
||||
/* Check that valid nid is set to memblks */
|
||||
for_each_mem_region(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) {
|
||||
pr_warn("Warning: invalid memblk node %d [mem %#010Lx-%#010Lx]\n",
|
||||
mblk_nid, mblk->base,
|
||||
mblk->base + mblk->size - 1);
|
||||
pr_warn("Warning: invalid memblk node %d [mem %pap-%pap]\n",
|
||||
mblk_nid, &start, &end);
|
||||
return -EINVAL;
|
||||
}
|
||||
}
|
||||
@ -427,14 +428,14 @@ out_free_distance:
|
||||
static int __init dummy_numa_init(void)
|
||||
{
|
||||
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;
|
||||
|
||||
if (numa_off)
|
||||
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) {
|
||||
pr_err("NUMA init failed\n");
|
||||
return ret;
|
||||
|
Loading…
Reference in New Issue
Block a user