On Wed, Nov 13, 2024, Arnd Bergmann wrote: > From: Arnd Bergmann <arnd@xxxxxxxx> > > Enabling KVM now causes a build failure on x86-32 if X86_LOCAL_APIC > is disabled: > > arch/x86/kvm/svm/svm.c: In function 'svm_emergency_disable_virtualization_cpu': > arch/x86/kvm/svm/svm.c:597:9: error: 'kvm_rebooting' undeclared (first use in this function); did you mean 'kvm_irq_routing'? > 597 | kvm_rebooting = true; > | ^~~~~~~~~~~~~ > | kvm_irq_routing > arch/x86/kvm/svm/svm.c:597:9: note: each undeclared identifier is reported only once for each function it appears in > make[6]: *** [scripts/Makefile.build:221: arch/x86/kvm/svm/svm.o] Error 1 > In file included from include/linux/rculist.h:11, > from include/linux/hashtable.h:14, > from arch/x86/kvm/svm/avic.c:18: > arch/x86/kvm/svm/avic.c: In function 'avic_pi_update_irte': > arch/x86/kvm/svm/avic.c:909:38: error: 'struct kvm' has no member named 'irq_routing' > 909 | irq_rt = srcu_dereference(kvm->irq_routing, &kvm->irq_srcu); > | ^~ > include/linux/rcupdate.h:538:17: note: in definition of macro '__rcu_dereference_check' > 538 | typeof(*p) *local = (typeof(*p) *__force)READ_ONCE(p); \ > > Move the dependency to the same place as before. > > Fixes: ea4290d77bda ("KVM: x86: leave kvm.ko out of the build if no vendor module is requested") > Reported-by: kernel test robot <lkp@xxxxxxxxx> > Closes: https://lore.kernel.org/oe-kbuild-all/202410060426.e9Xsnkvi-lkp@xxxxxxxxx/ > Signed-off-by: Arnd Bergmann <arnd@xxxxxxxx> > --- Acked-by: Sean Christopherson <seanjc@xxxxxxxxxx>