[thomas-weissschuh:b4/vdso-ptp 33/34] kernel/time/vsyscall.c:139:6: error: redefinition of 'update_vsyscall_aux'

[kernel test robot <lkp@intel.com>]

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/thomas.weissschuh/linux.git b4/vdso-ptp
head:   07453cfef5683be5805a70316b1345e7fbeb716b
commit: ebd243e4711bd78d33d6814c8addde1ef40cda4f [33/34] vdso: Add support for auxiliary clocks
config: arm-allyesconfig (https://download.01.org/0day-ci/archive/20250605/202506050936.bXT2AdmQ-lkp@intel.com/config)
compiler: arm-linux-gnueabi-gcc (GCC) 15.1.0
reproduce (this is a W=1 build): (https://download.01.org/0day-ci/archive/20250605/202506050936.bXT2AdmQ-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/202506050936.bXT2AdmQ-lkp@intel.com/

All errors (new ones prefixed by >>):

>> kernel/time/vsyscall.c:139:6: error: redefinition of 'update_vsyscall_aux'
     139 | void update_vsyscall_aux(struct timekeeper *tk, u8 clock_index)
         |      ^~~~~~~~~~~~~~~~~~~
   In file included from kernel/time/vsyscall.c:11:
   include/linux/timekeeper_internal.h:196:20: note: previous definition of 'update_vsyscall_aux' with type 'void(struct timekeeper *, u8)' {aka 'void(struct timekeeper *, unsigned char)'}
     196 | static inline void update_vsyscall_aux(struct timekeeper *tk, u8 clock_index)
         |                    ^~~~~~~~~~~~~~~~~~~


vim +/update_vsyscall_aux +139 kernel/time/vsyscall.c

   137	
   138	#ifdef CONFIG_POSIX_AUX_CLOCKS
 > 139	void update_vsyscall_aux(struct timekeeper *tk, u8 clock_index)
   140	{
   141		struct vdso_time_data *vdata = vdso_k_time_data;
   142		struct vdso_timestamp *vdso_ts;
   143		struct vdso_clock *vc;
   144		s32 clock_mode;
   145		u64 nsec;
   146	
   147		vc = &vdata->aux_clock_data[clock_index];
   148		vdso_ts = &vc->basetime[VDSO_BASE_AUX];
   149		clock_mode = tk->tkr_mono.clock->vdso_clock_mode;
   150		if (unlikely(!tk->clock_valid))
   151			clock_mode = VDSO_CLOCKMODE_NONE;
   152	
   153		/* copy vsyscall data */
   154		vdso_write_begin(vdata);
   155	
   156		vc->clock_mode = clock_mode;
   157	
   158		if (clock_mode != VDSO_CLOCKMODE_NONE) {
   159			fill_clock_configuration(vc, &tk->tkr_mono);
   160	
   161			vdso_ts->sec	= tk->xtime_sec;
   162	
   163			nsec = tk->tkr_mono.xtime_nsec >> tk->tkr_mono.shift;
   164			nsec += tk->offs_aux;
   165			vdso_ts->sec += __iter_div_u64_rem(nsec, NSEC_PER_SEC, &nsec);
   166			nsec = nsec << tk->tkr_mono.shift;
   167			vdso_ts->nsec = nsec;
   168		}
   169	
   170		__arch_update_vsyscall(vdata);
   171	
   172		vdso_write_end(vdata);
   173	
   174		__arch_sync_vdso_time_data(vdata);
   175	}
   176	#endif
   177	

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