[openeuler:OLK-6.6 3103/3103] mm/swap.h:66:26: error: implicit declaration of function 'swp_offset'; did you mean 'pud_offset'?

[openeuler:OLK-6.6 3103/3103] mm/swap.h:66:26: error: implicit declaration of function 'swp_offset'; did you mean 'pud_offset'?

[kernel test robot]

Hi Kairui,

FYI, the error/warning still remains.

tree:   https://gitee.com/openeuler/kernel.git OLK-6.6
head:   b2b8512ca97108929f3aca5405875d91577b8c80
commit: 5a72d2e54e8ff7c7f9510de875cf201ad18f36c4 [3103/3103] mm/shmem, swap: fix softlockup with mTHP swapin
config: x86_64-randconfig-005-20251105 (https://download.01.org/0day-ci/archive/20251105/202511052045.6ZI8bKFl-lkp@intel.com/config)
compiler: gcc-14 (Debian 14.2.0-19) 14.2.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20251105/202511052045.6ZI8bKFl-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/202511052045.6ZI8bKFl-lkp@intel.com/

All errors (new ones prefixed by >>):

   In file included from mm/shmem.c:43:
   mm/swap.h: In function 'non_swapcache_batch':
>> mm/swap.h:66:26: error: implicit declaration of function 'swp_offset'; did you mean 'pud_offset'? [-Wimplicit-function-declaration]
      66 |         pgoff_t offset = swp_offset(entry);
         |                          ^~~~~~~~~~
         |                          pud_offset
   In file included from mm/shmem.c:68:
   include/linux/swapops.h: At top level:
>> include/linux/swapops.h:107:23: error: conflicting types for 'swp_offset'; have 'long unsigned int(swp_entry_t)'
     107 | static inline pgoff_t swp_offset(swp_entry_t entry)
         |                       ^~~~~~~~~~
   mm/swap.h:66:26: note: previous implicit declaration of 'swp_offset' with type 'int()'
      66 |         pgoff_t offset = swp_offset(entry);
         |                          ^~~~~~~~~~


vim +66 mm/swap.h

    62	
    63	static inline int non_swapcache_batch(swp_entry_t entry, int max_nr)
    64	{
    65		struct swap_info_struct *si = swp_swap_info(entry);
  > 66		pgoff_t offset = swp_offset(entry);
    67		int i;
    68	
    69		/*
    70		 * While allocating a large folio and doing mTHP swapin, we need to
    71		 * ensure all entries are not cached, otherwise, the mTHP folio will
    72		 * be in conflict with the folio in swap cache.
    73		 */
    74		for (i = 0; i < max_nr; i++) {
    75			if ((si->swap_map[offset + i] & SWAP_HAS_CACHE))
    76				return i;
    77		}
    78	
    79		return i;
    80	}
    81	

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