diff --git a/[refs] b/[refs] index 330ba7718d66..60e5a786cede 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 5736199afba8a8bb60a1ea282ab72857d6b16400 +refs/heads/master: ec10f4750db5e810cafef114a592428f8242b640 diff --git a/trunk/include/linux/kvm.h b/trunk/include/linux/kvm.h index f0bebd61ff77..de9f28d96ced 100644 --- a/trunk/include/linux/kvm.h +++ b/trunk/include/linux/kvm.h @@ -53,6 +53,8 @@ struct kvm_irqchip { char dummy[512]; /* reserving space */ #ifdef CONFIG_X86 struct kvm_pic_state pic; +#endif +#if defined(CONFIG_X86) || defined(CONFIG_IA64) struct kvm_ioapic_state ioapic; #endif } chip;