linux-mm.kvack.org archive mirror
 help / color / mirror / Atom feed
* [linux-next:master 7142/8126] include/linux/numa_memblks.h:50:12: error: conflicting types for 'phys_to_target_node'; have 'int(phys_addr_t)' {aka 'int(unsigned int)'}
@ 2024-09-02  1:12 kernel test robot
  2024-09-02  6:46 ` Mike Rapoport
  0 siblings, 1 reply; 2+ messages in thread
From: kernel test robot @ 2024-09-02  1:12 UTC (permalink / raw)
  To: Mike Rapoport (Microsoft)
  Cc: oe-kbuild-all, Linux Memory Management List, Andrew Morton,
	Jonathan Cameron, Dan Williams

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@intel.com/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@intel.com/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@intel.com>
| Closes: https://lore.kernel.org/oe-kbuild-all/202409020920.5S9U7dww-lkp@intel.com/

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);
         |            ^~~~~~~~~~~~~~~~~~~
   In file included from include/linux/cpumask.h:17,
                    from arch/riscv/include/asm/processor.h:77,
                    from arch/riscv/include/asm/thread_info.h:37,
                    from include/linux/thread_info.h:60,
                    from include/asm-generic/preempt.h:5,
                    from ./arch/riscv/include/generated/asm/preempt.h:1,
                    from include/linux/preempt.h:79,
                    from include/linux/spinlock.h:56,
                    from include/linux/mmzone.h:8,
                    from include/linux/gfp.h:7,
                    from include/linux/mm.h:7,
                    from include/linux/memblock.h:12,
                    from mm/numa.c:3:
   include/linux/numa.h:47:5: note: previous declaration of 'phys_to_target_node' with type 'int(u64)' {aka 'int(long long unsigned int)'}
      47 | int phys_to_target_node(u64 start);
         |     ^~~~~~~~~~~~~~~~~~~
--
   In file included from mm/numa_memblks.c:8:
>> 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);
         |            ^~~~~~~~~~~~~~~~~~~
   In file included from include/linux/cpumask.h:17,
                    from arch/riscv/include/asm/processor.h:77,
                    from arch/riscv/include/asm/thread_info.h:37,
                    from include/linux/thread_info.h:60,
                    from include/asm-generic/preempt.h:5,
                    from ./arch/riscv/include/generated/asm/preempt.h:1,
                    from include/linux/preempt.h:79,
                    from include/linux/spinlock.h:56,
                    from include/linux/mmzone.h:8,
                    from include/linux/gfp.h:7,
                    from include/linux/mm.h:7,
                    from include/linux/memblock.h:12,
                    from mm/numa_memblks.c:6:
   include/linux/numa.h:47:5: note: previous declaration of 'phys_to_target_node' with type 'int(u64)' {aka 'int(long long unsigned int)'}
      47 | int phys_to_target_node(u64 start);
         |     ^~~~~~~~~~~~~~~~~~~
   include/linux/numa_memblks.h:51:29: error: conflicting types for 'phys_to_target_node'; have 'int(phys_addr_t)' {aka 'int(unsigned int)'}
      51 | #define phys_to_target_node phys_to_target_node
         |                             ^~~~~~~~~~~~~~~~~~~
   mm/numa_memblks.c:546:5: note: in expansion of macro 'phys_to_target_node'
     546 | int phys_to_target_node(phys_addr_t start)
         |     ^~~~~~~~~~~~~~~~~~~
   include/linux/numa.h:47:5: note: previous declaration of 'phys_to_target_node' with type 'int(u64)' {aka 'int(long long unsigned int)'}
      47 | int phys_to_target_node(u64 start);
         |     ^~~~~~~~~~~~~~~~~~~
   In file included from include/linux/linkage.h:7,
                    from include/linux/printk.h:8,
                    from mm/numa_memblks.c:5:
   include/linux/numa_memblks.h:51:29: error: conflicting types for 'phys_to_target_node'; have 'int(phys_addr_t)' {aka 'int(unsigned int)'}
      51 | #define phys_to_target_node phys_to_target_node
         |                             ^~~~~~~~~~~~~~~~~~~
   include/linux/export.h:56:28: note: in definition of macro '__EXPORT_SYMBOL'
      56 |         extern typeof(sym) sym;                                 \
         |                            ^~~
   include/linux/export.h:69:41: note: in expansion of macro '_EXPORT_SYMBOL'
      69 | #define EXPORT_SYMBOL_GPL(sym)          _EXPORT_SYMBOL(sym, "GPL")
         |                                         ^~~~~~~~~~~~~~
   mm/numa_memblks.c:559:1: note: in expansion of macro 'EXPORT_SYMBOL_GPL'
     559 | EXPORT_SYMBOL_GPL(phys_to_target_node);
         | ^~~~~~~~~~~~~~~~~
   mm/numa_memblks.c:559:19: note: in expansion of macro 'phys_to_target_node'
     559 | EXPORT_SYMBOL_GPL(phys_to_target_node);
         |                   ^~~~~~~~~~~~~~~~~~~
   include/linux/numa.h:47:5: note: previous declaration of 'phys_to_target_node' with type 'int(u64)' {aka 'int(long long unsigned int)'}
      47 | int phys_to_target_node(u64 start);
         |     ^~~~~~~~~~~~~~~~~~~


vim +50 include/linux/numa_memblks.h

    48	
    49	#ifdef CONFIG_NUMA_KEEP_MEMINFO
  > 50	extern int phys_to_target_node(phys_addr_t start);
    51	#define phys_to_target_node phys_to_target_node
    52	extern int memory_add_physaddr_to_nid(u64 start);
    53	#define memory_add_physaddr_to_nid memory_add_physaddr_to_nid
    54	#endif /* CONFIG_NUMA_KEEP_MEMINFO */
    55	

-- 
0-DAY CI Kernel Test Service
https://github.com/intel/lkp-tests/wiki


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: [linux-next:master 7142/8126] include/linux/numa_memblks.h:50:12: error: conflicting types for 'phys_to_target_node'; have 'int(phys_addr_t)' {aka 'int(unsigned int)'}
  2024-09-02  1:12 [linux-next:master 7142/8126] include/linux/numa_memblks.h:50:12: error: conflicting types for 'phys_to_target_node'; have 'int(phys_addr_t)' {aka 'int(unsigned int)'} kernel test robot
@ 2024-09-02  6:46 ` Mike Rapoport
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Rapoport @ 2024-09-02  6:46 UTC (permalink / raw)
  To: kernel test robot
  Cc: oe-kbuild-all, Linux Memory Management List, Andrew Morton,
	Jonathan Cameron, Dan Williams

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@intel.com/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@intel.com/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@intel.com>
> | Closes: https://lore.kernel.org/oe-kbuild-all/202409020920.5S9U7dww-lkp@intel.com/
> 
> 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.


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2024-09-02  6:49 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-09-02  1:12 [linux-next:master 7142/8126] include/linux/numa_memblks.h:50:12: error: conflicting types for 'phys_to_target_node'; have 'int(phys_addr_t)' {aka 'int(unsigned int)'} kernel test robot
2024-09-02  6:46 ` Mike Rapoport

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox