[kvm:queue,25/26] include/linux/kvm_host.h:333:11: error: 'KVM_NR_IRQCHIPS' undeclared here (not in a function)

Commit Message

Paolo Bonzini July 30, 2015, 12:13 p.m. UTC

On 30/07/2015 13:51, kbuild test robot wrote:
> tree:   git://git.kernel.org/pub/scm/virt/kvm/kvm.git queue
> head:   50079e2c9bcb2dd8ffe573c0edddbef9ad6fd809
> commit: b7b0d2b2f35c0e6882ea0b342318bf06472ce756 [25/26] KVM: x86: Add EOI exit bitmap inference
> config: mips-jz4740 (attached as .config)
> reproduce:
>   wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
>   chmod +x ~/bin/make.cross
>   git checkout b7b0d2b2f35c0e6882ea0b342318bf06472ce756
>   # save the attached .config to linux build tree
>   make.cross ARCH=mips 
> 
> All error/warnings (new ones prefixed by >>):
> 
>    In file included from arch/mips/kernel/asm-offsets.c:22:0:
>>> include/linux/kvm_host.h:333:11: error: 'KVM_NR_IRQCHIPS' undeclared here (not in a function)
>      int chip[KVM_NR_IRQCHIPS][KVM_IRQCHIP_NUM_PINS];
>               ^
>>> include/linux/kvm_host.h:333:28: error: 'KVM_IRQCHIP_NUM_PINS' undeclared here (not in a function)
>      int chip[KVM_NR_IRQCHIPS][KVM_IRQCHIP_NUM_PINS];
>                                ^
>    make[2]: *** [arch/mips/kernel/asm-offsets.s] Error 1
>    make[2]: Target '__build' not remade because of errors.
>    make[1]: *** [prepare0] Error 2
>    make[1]: Target 'prepare' not remade because of errors.
>    make: *** [sub-make] Error 2

Fix:

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to [e-mail]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/include/linux/kvm_host.h b/include/linux/kvm_host.h
index 821637f69d38..27ccdf91a465 100644
--- a/include/linux/kvm_host.h
+++ b/include/linux/kvm_host.h
@@ -329,6 +329,7 @@  struct kvm_kernel_irq_routing_entry {
 	struct hlist_node link;
 };
 
+#ifdef CONFIG_HAVE_KVM_IRQCHIP
 struct kvm_irq_routing_table {
 	int chip[KVM_NR_IRQCHIPS][KVM_IRQCHIP_NUM_PINS];
 	struct kvm_kernel_irq_routing_entry *rt_entries;
@@ -339,6 +340,7 @@  struct kvm_irq_routing_table {
 	 */
 	struct hlist_head map[0];
 };
+#endif
 
 #ifndef KVM_PRIVATE_MEM_SLOTS
 #define KVM_PRIVATE_MEM_SLOTS 0