On Mon, Sep 02, 2024 at 09:12:06AM +0800, kernel test robot wrote: > tree: https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git master > head: 985bf40edf4343dcb04c33f58b40b4a85c1776d4 > commit: 58b48700d8e043187d8032e0855f7ee8c4af5eac [7142/8126] mm: make range-to-target_node lookup facility a part of numa_memblks > config: riscv-randconfig-r022-20221228 (https://download.01.org/0day-ci/archive/20240902/202409020920.5S9U7dww-lkp@xxxxxxxxx/config) > compiler: riscv32-linux-gcc (GCC) 13.3.0 > reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20240902/202409020920.5S9U7dww-lkp@xxxxxxxxx/reproduce) > > If you fix the issue in a separate patch/commit (i.e. not just a new version of > the same patch/commit), kindly add following tags > | Reported-by: kernel test robot <lkp@xxxxxxxxx> > | Closes: https://lore.kernel.org/oe-kbuild-all/202409020920.5S9U7dww-lkp@xxxxxxxxx/ > > All errors (new ones prefixed by >>): > > In file included from mm/numa.c:6: > >> include/linux/numa_memblks.h:50:12: error: conflicting types for 'phys_to_target_node'; have 'int(phys_addr_t)' {aka 'int(unsigned int)'} > 50 | extern int phys_to_target_node(phys_addr_t start); > | ^~~~~~~~~~~~~~~~~~~ Andrew, can you please apply this fixup? diff --git a/include/linux/numa_memblks.h b/include/linux/numa_memblks.h index 17d4bcc34091..cfad6ce7e1bd 100644 --- a/include/linux/numa_memblks.h +++ b/include/linux/numa_memblks.h @@ -47,7 +47,7 @@ static inline int numa_emu_cmdline(char *str) #endif /* CONFIG_NUMA_EMU */ #ifdef CONFIG_NUMA_KEEP_MEMINFO -extern int phys_to_target_node(phys_addr_t start); +extern int phys_to_target_node(u64 start); #define phys_to_target_node phys_to_target_node extern int memory_add_physaddr_to_nid(u64 start); #define memory_add_physaddr_to_nid memory_add_physaddr_to_nid diff --git a/mm/numa_memblks.c b/mm/numa_memblks.c index a28507cf1e7f..be52b93a9c58 100644 --- a/mm/numa_memblks.c +++ b/mm/numa_memblks.c @@ -543,7 +543,7 @@ static int meminfo_to_nid(struct numa_meminfo *mi, u64 start) return NUMA_NO_NODE; } -int phys_to_target_node(phys_addr_t start) +int phys_to_target_node(u64 start) { int nid = meminfo_to_nid(&numa_meminfo, start); -- Sincerely yours, Mike.
