From: kernel test robot <lkp@intel.com>
To: Tianyu Lan <tiala@microsoft.com>
Cc: oe-kbuild-all@lists.linux.dev, Michael Kelley <mikelley@microsoft.com>
Subject: [lantianyu:test 16/17] arch/x86/kernel/cpu/mshyperv.c:303:49: error: 'hv_snp_boot_ap' undeclared
Date: Fri, 11 Aug 2023 10:49:20 +0800 [thread overview]
Message-ID: <202308111006.VraHp0Ax-lkp@intel.com> (raw)
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
reply other threads:[~2023-08-11 2:49 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=202308111006.VraHp0Ax-lkp@intel.com \
--to=lkp@intel.com \
--cc=mikelley@microsoft.com \
--cc=oe-kbuild-all@lists.linux.dev \
--cc=tiala@microsoft.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.