[lantianyu:test 16/17] arch/x86/kernel/cpu/mshyperv.c:303:49: error: 'hv_snp_boot_ap' undeclared

[lantianyu:test 16/17] arch/x86/kernel/cpu/mshyperv.c:303:49: error: 'hv_snp_boot_ap' undeclared

[kernel test robot]

tree:   https://github.com/lantianyu/linux test
head:   270445ff219a23bda92bf6aa95bb0afabe263791
commit: ddcd3dc1f1669f634afe0be928d4559541a89bec [16/17] x86/hyperv: Add smp support for SEV-SNP guest
config: x86_64-rhel-8.3 (https://download.01.org/0day-ci/archive/20230811/202308111006.VraHp0Ax-lkp@intel.com/config)
compiler: gcc-12 (Debian 12.2.0-14) 12.2.0
reproduce: (https://download.01.org/0day-ci/archive/20230811/202308111006.VraHp0Ax-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/202308111006.VraHp0Ax-lkp@intel.com/

All errors (new ones prefixed by >>):

   In file included from arch/x86/kernel/cpu/mshyperv.c:24:
   arch/x86/include/asm/mshyperv.h:249:1: error: version control conflict marker in file
     249 | <<<<<<< ours
         | ^~~~~~~
   arch/x86/include/asm/mshyperv.h:251:1: error: version control conflict marker in file
     251 | =======
         | ^~~~~~~
   arch/x86/include/asm/mshyperv.h:254:1: error: version control conflict marker in file
     254 | >>>>>>> theirs
         | ^~~~~~~
   arch/x86/kernel/cpu/mshyperv.c: In function 'hv_smp_prepare_cpus':
>> arch/x86/kernel/cpu/mshyperv.c:303:49: error: 'hv_snp_boot_ap' undeclared (first use in this function)
     303 |                 apic->wakeup_secondary_cpu_64 = hv_snp_boot_ap;
         |                                                 ^~~~~~~~~~~~~~
   arch/x86/kernel/cpu/mshyperv.c:303:49: note: each undeclared identifier is reported only once for each function it appears in


vim +/hv_snp_boot_ap +303 arch/x86/kernel/cpu/mshyperv.c

   295	
   296		native_smp_prepare_cpus(max_cpus);
   297	
   298		/*
   299		 *  Override wakeup_secondary_cpu_64 callback for SEV-SNP
   300		 *  enlightened guest.
   301		 */
   302		if (hv_isolation_type_en_snp())
 > 303			apic->wakeup_secondary_cpu_64 = hv_snp_boot_ap;
   304	
   305		if (!hv_root_partition)
   306			return;
   307	

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